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

3a7c1464

Commit 3a7c1464 authored 5 years ago by rinpatch Committed by kaniini 5 years ago

Downloads
- Patches
- Plain Diff

- Actually use preloaded bookmarks in views

- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests

parent f841eb7c

Branches feat/media-modal

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/activity.ex 9 additions, 4 deletions

lib/pleroma/activity.ex
lib/pleroma/bookmark.ex 2 additions, 1 deletion

lib/pleroma/bookmark.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 8 additions, 1 deletion

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/status_view.ex 15 additions, 3 deletions

lib/pleroma/web/mastodon_api/views/status_view.ex
test/activity_test.exs 41 additions, 19 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 77 additions and 28 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