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

d4847b17

Commit d4847b17 authored 5 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'

Add virtual :thread_muted? field

Closes #901

See merge request pleroma/pleroma!1178

parents 943d1b2f eb02edca

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 12 additions, 0 deletions

lib/pleroma/activity.ex
lib/pleroma/web/activity_pub/activity_pub.ex 8 additions, 0 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/views/status_view.ex 7 additions, 1 deletion

lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/twitter_api/views/activity_view.ex 7 additions, 1 deletion

lib/pleroma/web/twitter_api/views/activity_view.ex
test/activity_test.exs 26 additions, 0 deletions

test/activity_test.exs
test/user_test.exs 1 addition, 1 deletion

test/user_test.exs

with 61 additions and 3 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