Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

4c5125de

Commit 4c5125de authored 5 years ago by rinpatch Committed by kaniini 5 years ago

Downloads
- Patches
- Plain Diff

Remove `bookmarks` assoc and add a fake `bookmark` assoc instead

parent be067ec2

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/activity.ex 21 additions, 8 deletions

lib/pleroma/activity.ex
lib/pleroma/bookmark.ex 1 addition, 2 deletions

lib/pleroma/bookmark.ex
lib/pleroma/web/activity_pub/activity_pub.ex 8 additions, 7 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 2 additions, 9 deletions

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/status_view.ex 8 additions, 16 deletions

lib/pleroma/web/mastodon_api/views/status_view.ex
test/activity_test.exs 30 additions, 36 deletions

test/activity_test.exs

with 70 additions and 78 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment