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

adcdd21f

Commit adcdd21f authored 6 years ago by Karen Konou

Downloads
- Plain Diff

Merge branch 'develop' into hellthread-filter-fix

parents 1d727cd0 0534463c

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

config/dev.exs 2 additions, 1 deletion

config/dev.exs
docs/Clients.md 11 additions, 0 deletions

docs/Clients.md
lib/pleroma/plugs/http_security_plug.ex 19 additions, 4 deletions

lib/pleroma/plugs/http_security_plug.ex
lib/pleroma/web/activity_pub/mrf/keyword_policy.ex 18 additions, 10 deletions

lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
lib/pleroma/web/rich_media/parser.ex 8 additions, 1 deletion

lib/pleroma/web/rich_media/parser.ex
test/web/activity_pub/mrf/keyword_policy_test.exs 120 additions, 12 deletions

test/web/activity_pub/mrf/keyword_policy_test.exs

with 178 additions and 28 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