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

430f2332

Commit 430f2332 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'rename-followings' into 'develop'

hide_followings was renamed to hide_followers in the FE, but never synced up in the BE

See merge request pleroma/pleroma!787

parents 1220a171 74518d0b

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

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

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

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

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

lib/pleroma/web/twitter_api/twitter_api_controller.ex
lib/pleroma/web/twitter_api/views/user_view.ex 1 addition, 1 deletion

lib/pleroma/web/twitter_api/views/user_view.ex
test/web/activity_pub/activity_pub_controller_test.exs 2 additions, 2 deletions

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

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

test/web/twitter_api/twitter_api_controller_test.exs
test/web/twitter_api/views/user_view_test.exs 4 additions, 4 deletions

test/web/twitter_api/views/user_view_test.exs

with 27 additions and 27 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