diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-21 16:25:45 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-21 16:25:45 -0500 |
| commit | 97c60b6a4308b77d0e4956b83a16b88292b62e37 (patch) | |
| tree | db496d0f94e00b199be95ee285174f378f512daa /config/config.exs | |
| parent | 7ce722ce3e3dbc633324ff0ccaeddc467397ac5e (diff) | |
| parent | 2b5d9eb10529325aef1b4aab980bd901ba6b0c70 (diff) | |
| download | pleroma-97c60b6a4308b77d0e4956b83a16b88292b62e37.tar.gz pleroma-97c60b6a4308b77d0e4956b83a16b88292b62e37.zip | |
Merge branch 'develop' into fix/pleroma-api-emoji-packs
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", |