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

dd8f2196

Commit dd8f2196 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch '483_blocks_import_export' into 'develop'

[#483] Blocked users list import & export

Closes #483

See merge request pleroma/pleroma!603

parents 7117ab43 242cc9a6

Branches

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/user.ex 45 additions, 1 deletion

lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 2 additions, 4 deletions

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

lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex 15 additions, 14 deletions

lib/pleroma/web/twitter_api/controllers/util_controller.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 8 additions, 0 deletions

lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/user_test.exs 48 additions, 0 deletions

test/user_test.exs
test/web/twitter_api/twitter_api_controller_test.exs 18 additions, 0 deletions

test/web/twitter_api/twitter_api_controller_test.exs
test/web/twitter_api/util_controller_test.exs 35 additions, 0 deletions

test/web/twitter_api/util_controller_test.exs

with 173 additions and 19 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