Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

b536e571

Commit b536e571 authored 4 years ago by Haelwenn

Downloads
- Plain Diff

Merge branch '1866-last-status-stuff' into 'develop'

Resolve "/api/v1/conversations returns the wrong `last_status`"

Closes #1866

See merge request pleroma/pleroma!2647

parents 8bfacffa 1092b365

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
lib/pleroma/conversation/participation.ex 7 additions, 4 deletions

lib/pleroma/conversation/participation.ex
lib/pleroma/web/activity_pub/activity_pub.ex 4 additions, 3 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/views/conversation_view.ex 7 additions, 4 deletions

lib/pleroma/web/mastodon_api/views/conversation_view.ex
test/web/mastodon_api/views/conversation_view_test.exs 10 additions, 1 deletion

test/web/mastodon_api/views/conversation_view_test.exs

with 29 additions and 12 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