diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-11-03 16:18:19 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-11-03 16:18:19 +0000 |
| commit | 61bcd4595fa61bd79a7bcb553968df9fc8306499 (patch) | |
| tree | c1ac1eba2dc4a942e1d4a0e43aaf69e9db33a28c /config | |
| parent | 9d8da9ea1501203662e08b6814ac324415653f3e (diff) | |
| parent | 55ef88ef95ecda94ea416bd3a8492f992488ea83 (diff) | |
| download | pleroma-61bcd4595fa61bd79a7bcb553968df9fc8306499.tar.gz pleroma-61bcd4595fa61bd79a7bcb553968df9fc8306499.zip | |
Merge branch 'feature/fast_sanitize' into 'develop'
Switching to FastSanitize
See merge request pleroma/pleroma!1916
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index a69d41d17..81d50cdee 100644 --- a/config/config.exs +++ b/config/config.exs @@ -284,8 +284,8 @@ config :pleroma, :markup, allow_tables: false, allow_fonts: false, scrub_policy: [ - Pleroma.HTML.Transform.MediaProxy, - Pleroma.HTML.Scrubber.Default + Pleroma.HTML.Scrubber.Default, + Pleroma.HTML.Transform.MediaProxy ] config :pleroma, :frontend_configurations, @@ -603,6 +603,7 @@ config :pleroma, :web_cache_ttl, activity_pub: nil, activity_pub_question: 30_000 +config :swarm, node_blacklist: [~r/myhtmlex_.*$/] # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |