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

478eb594

Commit 478eb594 authored 5 years ago by lain

Downloads
- Plain Diff

Merge branch 'add-direct-conversation-id-to-conversation-event' into 'develop'

Add `pleroma.direct_conversation_id` to the `conversation` event payload

See merge request pleroma/pleroma!1925

parents a304a2a8 ed29be24

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
lib/pleroma/web/mastodon_api/views/conversation_view.ex 5 additions, 1 deletion

lib/pleroma/web/mastodon_api/views/conversation_view.ex
lib/pleroma/web/mastodon_api/views/status_view.ex 5 additions, 1 deletion

lib/pleroma/web/mastodon_api/views/status_view.ex
test/web/mastodon_api/views/conversation_view_test.exs 1 addition, 0 deletions

test/web/mastodon_api/views/conversation_view_test.exs
test/web/mastodon_api/views/status_view_test.exs 23 additions, 2 deletions

test/web/mastodon_api/views/status_view_test.exs
test/web/streamer/streamer_test.exs 10 additions, 2 deletions

test/web/streamer/streamer_test.exs

with 45 additions and 6 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