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

7f79b467

Commit 7f79b467 authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'feature/domain-blocks' into 'develop'

Domain blocks

See merge request pleroma/pleroma!190

parents 45a935f0 29c9c8d9

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

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

lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex 3 additions, 1 deletion

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 14 additions, 0 deletions

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex 4 additions, 1 deletion

lib/pleroma/web/router.ex
priv/repo/migrations/20180606173637_create_apid_host_extraction_index.exs 8 additions, 0 deletions

...ions/20180606173637_create_apid_host_extraction_index.exs
test/user_test.exs 21 additions, 0 deletions

test/user_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs 40 additions, 0 deletions

test/web/mastodon_api/mastodon_api_controller_test.exs

with 115 additions and 3 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