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

1eecbc1c

Commit 1eecbc1c authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'feature/keyword-policy' into 'develop'

Add keyword policy

See merge request pleroma/pleroma!794

parents c5f8df08 b05a3411

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 5 additions, 0 deletions

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

docs/config.md
lib/pleroma/web/activity_pub/mrf/keyword_policy.ex 73 additions, 0 deletions

lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex 28 additions, 0 deletions

lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
test/web/activity_pub/mrf/keyword_policy_test.exs 111 additions, 0 deletions

test/web/activity_pub/mrf/keyword_policy_test.exs

with 222 additions and 0 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