diff options
| author | Roman Chvanikov <roman@Romans-MacBook-Pro-2.local> | 2019-06-05 02:45:21 +0300 |
|---|---|---|
| committer | Roman Chvanikov <roman@Romans-MacBook-Pro-2.local> | 2019-06-05 02:45:21 +0300 |
| commit | b1b1a270e8f17b76d08771ca1e4025b1d227da05 (patch) | |
| tree | 41a5896012a3f55f3de31f7ec97dc397ba02cd62 /config | |
| parent | f6036ce3b9649902ce1c2af819616ad25f0caef1 (diff) | |
| parent | 5188add534a1532ef323a0fec3503f8e96dfe762 (diff) | |
| download | pleroma-b1b1a270e8f17b76d08771ca1e4025b1d227da05.tar.gz pleroma-b1b1a270e8f17b76d08771ca1e4025b1d227da05.zip | |
Fix conflict
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 92af4ca1b..d52f594e8 100644 --- a/config/config.exs +++ b/config/config.exs @@ -243,7 +243,8 @@ config :pleroma, :instance, max_report_comment_size: 1000, safe_dm_mentions: false, healthcheck: false, - remote_post_retention_days: 90 + remote_post_retention_days: 90, + skip_thread_containment: false config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800 @@ -326,6 +327,8 @@ config :pleroma, :mrf_keyword, federated_timeline_removal: [], replace: [] +config :pleroma, :mrf_subchain, match_actor: %{} + config :pleroma, :rich_media, enabled: true config :pleroma, :media_proxy, @@ -459,7 +462,11 @@ config :pleroma, :ldap, config :esshd, enabled: false -oauth_consumer_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "") +oauth_consumer_strategies = + System.get_env("OAUTH_CONSUMER_STRATEGIES") + |> to_string() + |> String.split() + |> Enum.map(&hd(String.split(&1, ":"))) ueberauth_providers = for strategy <- oauth_consumer_strategies do |