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

14deed7f

Commit 14deed7f authored 5 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'

Optimize bookmarks by preloading them with activities

Closes #861

See merge request pleroma/pleroma!1121

parents a1a0df19 d64c3b60

Branches

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/activity.ex 24 additions, 0 deletions

lib/pleroma/activity.ex
lib/pleroma/user.ex 0 additions, 2 deletions

lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex 21 additions, 0 deletions

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

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/status_view.ex 11 additions, 7 deletions

lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 1 addition, 0 deletions

lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/activity_test.exs 45 additions, 0 deletions

test/activity_test.exs
test/web/mastodon_api/status_view_test.exs 2 additions, 0 deletions

test/web/mastodon_api/status_view_test.exs

with 106 additions and 33 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