X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=ba263bf95b4b543b8c30ef8ccb814d1d66310c3a;hb=de3bdc63adac0141500bdc2692124cd104330bda;hp=09dd9e786d4cdbe4b8b196848be5e3f18ea1615c;hpb=08732e8a0335ae44c866c2dd63927c65158b27c9;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 09dd9e786..ba263bf95 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -172,7 +172,7 @@ config :mime, :types, %{
   "application/ld+json" => ["activity+json"]
 }
 
-config :tesla, adapter: Tesla.Adapter.Gun
+config :tesla, adapter: Tesla.Adapter.Hackney
 
 # Configures http settings, upstream proxy etc.
 config :pleroma, :http,
@@ -205,6 +205,7 @@ config :pleroma, :instance,
   registrations_open: true,
   invites_enabled: false,
   account_activation_required: false,
+  account_approval_required: false,
   federating: true,
   federation_incoming_replies_max_depth: 100,
   federation_reachability_timeout_days: 7,
@@ -237,6 +238,7 @@ config :pleroma, :instance,
   max_remote_account_fields: 20,
   account_field_name_length: 512,
   account_field_value_length: 2048,
+  registration_reason_length: 500,
   external_user_synchronization: true,
   extended_nickname_format: true,
   cleanup_attachments: false,
@@ -250,7 +252,8 @@ config :pleroma, :instance,
       number: 5,
       length: 16
     ]
-  ]
+  ],
+  show_reactions: true
 
 config :pleroma, :welcome,
   direct_message: [
@@ -506,7 +509,8 @@ config :pleroma, Pleroma.User,
     "user_exists",
     "users",
     "web"
-  ]
+  ],
+  email_blacklist: []
 
 config :pleroma, Oban,
   repo: Pleroma.Repo,
@@ -647,7 +651,8 @@ config :pleroma, :static_fe, enabled: false
 
 # Example of frontend configuration
 # This example will make us serve the primary frontend from the
-# `/frontends/pleroma/develop` folder in your instance static directory.
+# frontends directory within your `:pleroma, :instance, static_dir`.
+# e.g., instance/static/frontends/pleroma/develop/
 #
 # With no frontend configuration, the bundled files from the `static` directory will
 # be used.