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

48a03156

Commit 48a03156 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'follower-hiding' into 'develop'

Network hiding

Closes #356

See merge request pleroma/pleroma!490

parents 6ab58fdf 7d5720f2

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/user/info.ex 2 additions, 0 deletions

lib/pleroma/user/info.ex
lib/pleroma/web/activity_pub/views/user_view.ex 6 additions, 6 deletions

lib/pleroma/web/activity_pub/views/user_view.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 16 additions, 3 deletions

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 18 additions, 4 deletions

lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/activity_pub/activity_pub_controller_test.exs 28 additions, 0 deletions

test/web/activity_pub/activity_pub_controller_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs 50 additions, 0 deletions

test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/twitter_api/twitter_api_controller_test.exs 121 additions, 0 deletions

test/web/twitter_api/twitter_api_controller_test.exs

with 241 additions and 13 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