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
/
description.exs
diff --git
a/config/description.exs
b/config/description.exs
index 91261c1e17e1228de1c1986b01bfe4771af410f4..30a503696c2271a14738316d837e2f56a38610a6 100644
(file)
--- a/
config/description.exs
+++ b/
config/description.exs
@@
-661,6
+661,11
@@
config :pleroma, :config_description, [
type: :boolean,
description: "Require users to confirm their emails before signing in"
},
type: :boolean,
description: "Require users to confirm their emails before signing in"
},
+ %{
+ key: :account_approval_required,
+ type: :boolean,
+ description: "Require users to be manually approved by an admin before signing in"
+ },
%{
key: :federating,
type: :boolean,
%{
key: :federating,
type: :boolean,
@@
-874,6
+879,14
@@
config :pleroma, :config_description, [
2048
]
},
2048
]
},
+ %{
+ key: :registration_reason_length,
+ type: :integer,
+ description: "Maximum registration reason length. Default: 500.",
+ suggestions: [
+ 500
+ ]
+ },
%{
key: :external_user_synchronization,
type: :boolean,
%{
key: :external_user_synchronization,
type: :boolean,