Merge remote-tracking branch 'upstream/develop' into hide-reactions

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 09dd9e786d4cdbe4b8b196848be5e3f18ea1615c..857e0afbbeebe9f62e532cfaaa6f78120b226b2f 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -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: [
@@ -647,7 +650,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.