X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=acf3b5c969ae50960562ba9d31194d93256dd750;hb=643664d58365c88beb8a6da9c02a15ec6c8ef48d;hp=16b7f6dc76d1c9925ea10ea1bc7eb15c7618b198;hpb=3edaecae96975c229c3b8bd7be2dc1208b9bcb82;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 16b7f6dc7..acf3b5c96 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -260,7 +260,7 @@ config :pleroma, :welcome,
   ],
   email: [
     enabled: false,
-    sender_nickname: nil,
+    sender: nil,
     subject: "Welcome to <%= instance_name %>",
     html: "Welcome to <%= instance_name %>",
     text: "Welcome to <%= instance_name %>"
@@ -539,16 +539,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",