diff options
| author | lain <lain@soykaf.club> | 2020-07-21 22:18:17 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-21 22:18:17 +0000 |
| commit | 5b1eeb06d81872696fac89dba457fe62b62d6182 (patch) | |
| tree | 3082a53ce7d092bf8e4e9a3dfafa8ad5f701f7fc /config/config.exs | |
| parent | c36113cdf5865cbccbd1da2f7404454134139e43 (diff) | |
| download | pleroma-5b1eeb06d81872696fac89dba457fe62b62d6182.tar.gz pleroma-5b1eeb06d81872696fac89dba457fe62b62d6182.zip | |
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
This reverts merge request !2784
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/config/config.exs b/config/config.exs index 2d3f35e70..406bf2a9b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -527,16 +527,14 @@ config :pleroma, :workers, federator_outgoing: 5 ] -config :auto_linker, - opts: [ - extra: true, - # TODO: Set to :no_scheme when it works properly - validate_tld: true, - class: false, - strip_prefix: false, - new_window: false, - rel: "ugc" - ] +config :pleroma, Pleroma.Formatter, + class: false, + rel: "ugc", + new_window: false, + truncate: false, + strip_prefix: false, + extra: true, + validate_tld: :no_scheme config :pleroma, :ldap, enabled: System.get_env("LDAP_ENABLED") == "true", |