summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-09-16 01:31:03 +0000
committerkaniini <nenolod@gmail.com>2018-09-16 01:31:03 +0000
commit28812752918c59bedc3526c0a4ac7c490d1a5b22 (patch)
treeb768f7bc2f044deb2964638c80549e2468df9a79 /config
parent8eed5938d5fb6cac9075d2b75b69d2c93316db01 (diff)
parent342ed844464bd32f633959b5fd48711c29c01566 (diff)
downloadpleroma-28812752918c59bedc3526c0a4ac7c490d1a5b22.tar.gz
pleroma-28812752918c59bedc3526c0a4ac7c490d1a5b22.zip
Merge branch 'feature/mrf-scrub' into 'develop'
MRF: html scrubbing filter See merge request pleroma/pleroma!345
Diffstat (limited to 'config')
-rw-r--r--config/config.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index d5c5b7902..d8edc4862 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -104,6 +104,8 @@ config :pleroma, :activitypub,
config :pleroma, :user, deny_follow_blocked: true
+config :pleroma, :mrf_normalize_markup, scrub_policy: Pleroma.HTML.Scrubber.Default
+
config :pleroma, :mrf_rejectnonpublic,
allow_followersonly: false,
allow_direct: false