projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users...
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 48fe7c669b75da802ee30806de561227e166fb70..4b91a58b746de9830726a80d8a8524e8a997852e 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,
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,
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,
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,
external_user_synchronization: true,
extended_nickname_format: true,
cleanup_attachments: false,