Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

cf426a71

Commit cf426a71 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'with-mutes' into 'develop'

Add `with_muted` param.

Closes #683

See merge request pleroma/pleroma!872

parents 90a24fbf bbbdbec4

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

docs/Differences-in-MastodonAPI-Responses.md 4 additions, 0 deletions

docs/Differences-in-MastodonAPI-Responses.md
lib/pleroma/user.ex 1 addition, 0 deletions

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

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

lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/twitter_api/representers/activity_representer.ex 5 additions, 242 deletions

...roma/web/twitter_api/representers/activity_representer.ex
lib/pleroma/web/twitter_api/views/activity_view.ex 3 additions, 1 deletion

lib/pleroma/web/twitter_api/views/activity_view.ex
test/web/activity_pub/activity_pub_test.exs 7 additions, 0 deletions

test/web/activity_pub/activity_pub_test.exs
test/web/mastodon_api/status_view_test.exs 16 additions, 0 deletions

test/web/mastodon_api/status_view_test.exs
test/web/twitter_api/representers/activity_representer_test.exs 1 addition, 42 deletions

...eb/twitter_api/representers/activity_representer_test.exs
test/web/twitter_api/views/activity_view_test.exs 18 additions, 1 deletion

test/web/twitter_api/views/activity_view_test.exs

with 58 additions and 287 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