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

18e783bc

Commit 18e783bc authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'add-admin-and-moderator-fields' into 'develop'

Add admin and moderator badges to user view and make their visibility configurable

See merge request !767

parents 09b71a90 035eaeb9

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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

lib/pleroma/user/info.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 20 additions, 0 deletions

lib/pleroma/web/twitter_api/views/user_view.ex
test/web/twitter_api/twitter_api_controller_test.exs 35 additions, 5 deletions

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

test/web/twitter_api/views/user_view_test.exs

with 78 additions and 9 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