diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-26 03:55:20 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-26 03:55:20 +0000 |
| commit | e6f036b9adf91aa81afc676c13ccecf04359241c (patch) | |
| tree | 99e4fe5fbdfad8bc2ff7682837d8e6001ca3f518 /config | |
| parent | d80859731e50393851e6026ad301ed20d2b0db2a (diff) | |
| parent | 437fd6046d6e6f19a5b9cd2e8178ec872a94af5d (diff) | |
| download | pleroma-e6f036b9adf91aa81afc676c13ccecf04359241c.tar.gz pleroma-e6f036b9adf91aa81afc676c13ccecf04359241c.zip | |
Merge branch 'issues/1016' into 'develop'
[#1016] add clear formatted text/ removes links with private ip
See merge request pleroma/pleroma!1335
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 | ||||
| -rw-r--r-- | config/test.exs | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 0d07fc692..5032b24e6 100644 --- a/config/config.exs +++ b/config/config.exs @@ -330,7 +330,10 @@ config :pleroma, :mrf_keyword, config :pleroma, :mrf_subchain, match_actor: %{} -config :pleroma, :rich_media, enabled: true +config :pleroma, :rich_media, + enabled: true, + ignore_hosts: [], + ignore_tld: ["local", "localdomain", "lan"] config :pleroma, :media_proxy, enabled: false, diff --git a/config/test.exs b/config/test.exs index 73a8b82a1..9d441a7f5 100644 --- a/config/test.exs +++ b/config/test.exs @@ -43,7 +43,11 @@ config :pleroma, Pleroma.Repo, config :pbkdf2_elixir, rounds: 1 config :tesla, adapter: Tesla.Mock -config :pleroma, :rich_media, enabled: false + +config :pleroma, :rich_media, + enabled: false, + ignore_hosts: [], + ignore_tld: ["local", "localdomain", "lan"] config :web_push_encryption, :vapid_details, subject: "mailto:administrator@example.com", |