diff options
| author | lain <lain@soykaf.club> | 2019-06-04 11:23:46 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-06-04 11:23:46 +0200 |
| commit | 4cab98b7bfc2117055c97a36369759047083cef9 (patch) | |
| tree | 6efe9dc26579efdec95e0e2f593383f7443fcfc0 /config | |
| parent | 25198d48f7e799ff350c8c7c57518b6ee49e6f8d (diff) | |
| parent | d977d73b91dbf8e9129de0478c51114d7d462edf (diff) | |
| download | pleroma-4cab98b7bfc2117055c97a36369759047083cef9.tar.gz pleroma-4cab98b7bfc2117055c97a36369759047083cef9.zip | |
Merge remote-tracking branch 'origin/develop' into explicit-addressing
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 09c3be7de..7d70c1a5e 100644 --- a/config/config.exs +++ b/config/config.exs @@ -326,6 +326,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 +461,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 |