diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-23 16:38:27 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-23 16:38:27 +0000 |
| commit | c7d69e925664ce7125c3938c298d72e94a2a1349 (patch) | |
| tree | 717028080c5c6a84b0362e67e86aa8a51b2c005b /config/config.exs | |
| parent | b7f297f0bd214416f3faded4a6221899b68edabd (diff) | |
| parent | 9a82de219c264f467b485316570c5425e3fe2f00 (diff) | |
| download | pleroma-c7d69e925664ce7125c3938c298d72e94a2a1349.tar.gz | |
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index e0888fa9a..a81ffcd3b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -210,7 +210,6 @@ config :pleroma, :instance, Pleroma.Web.ActivityPub.Publisher ], allow_relay: true, - rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, public: true, quarantined_instances: [], managed_config: true, @@ -221,8 +220,6 @@ config :pleroma, :instance, "text/markdown", "text/bbcode" ], - mrf_transparency: true, - mrf_transparency_exclusions: [], autofollowed_nicknames: [], max_pinned_statuses: 1, attachment_links: false, @@ -693,6 +690,11 @@ config :pleroma, :restrict_unauthenticated, config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false +config :pleroma, :mrf, + policies: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, + transparency: true, + transparency_exclusions: [] + # 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" |