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

75e78d4e

Commit 75e78d4e authored 5 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'feature/mrf-user-filter' into 'develop'

mrf: add support for filtering users

See merge request pleroma/pleroma!1188

parents f0516d91 7d9b33b3

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 2 additions, 0 deletions

CHANGELOG.md
config/config.exs 3 additions, 1 deletion

config/config.exs
docs/config.md 3 additions, 0 deletions

docs/config.md
lib/pleroma/web/activity_pub/activity_pub.ex 13 additions, 3 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/mrf/simple_policy.ex 36 additions, 2 deletions

lib/pleroma/web/activity_pub/mrf/simple_policy.ex
lib/pleroma/web/activity_pub/mrf/user_allowlist.ex 4 additions, 2 deletions

lib/pleroma/web/activity_pub/mrf/user_allowlist.ex
test/web/activity_pub/mrf/simple_policy_test.exs 72 additions, 1 deletion

test/web/activity_pub/mrf/simple_policy_test.exs

with 133 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