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

94d8f1ab

Commit 94d8f1ab authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch '394_user_tags' into 'develop'

[#394] User tags

Closes #394

See merge request pleroma/pleroma!508

parents da4315b5 1cea97df

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/user.ex 39 additions, 0 deletions

lib/pleroma/user.ex
lib/pleroma/web/admin_api/admin_api_controller.ex 12 additions, 0 deletions

lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/controller_helper.ex 9 additions, 0 deletions

lib/pleroma/web/controller_helper.ex
lib/pleroma/web/mastodon_api/views/account_view.ex 5 additions, 0 deletions

lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/router.ex 2 additions, 0 deletions

lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/views/user_view.ex 6 additions, 1 deletion

lib/pleroma/web/twitter_api/views/user_view.ex
priv/repo/migrations/20181206125616_add_tags_to_users.exs 11 additions, 0 deletions

priv/repo/migrations/20181206125616_add_tags_to_users.exs
test/web/admin_api/admin_api_controller_test.exs 72 additions, 0 deletions

test/web/admin_api/admin_api_controller_test.exs
test/web/mastodon_api/account_view_test.exs 4 additions, 2 deletions

test/web/mastodon_api/account_view_test.exs
test/web/twitter_api/views/user_view_test.exs 8 additions, 4 deletions

test/web/twitter_api/views/user_view_test.exs

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