summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-21 22:17:34 +0000
committerlain <lain@soykaf.club>2020-07-21 22:17:34 +0000
commit696c13ce54aff25737f8f753a94747d79b9c54b0 (patch)
tree99d52ee68fdaef14d5fc3e63ec90e6f241ea56c5 /config/config.exs
parent2b5d9eb10529325aef1b4aab980bd901ba6b0c70 (diff)
downloadpleroma-696c13ce54aff25737f8f753a94747d79b9c54b0.tar.gz
pleroma-696c13ce54aff25737f8f753a94747d79b9c54b0.zip
Revert "Merge branch 'linkify' into 'develop'"
This reverts merge request !2677
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs18
1 files changed, 10 insertions, 8 deletions
diff --git a/config/config.exs b/config/config.exs
index 406bf2a9b..2d3f35e70 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -527,14 +527,16 @@ config :pleroma, :workers,
federator_outgoing: 5
]
-config :pleroma, Pleroma.Formatter,
- class: false,
- rel: "ugc",
- new_window: false,
- truncate: false,
- strip_prefix: false,
- extra: true,
- validate_tld: :no_scheme
+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, :ldap,
enabled: System.get_env("LDAP_ENABLED") == "true",