diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-07-29 13:01:16 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-07-29 13:01:16 -0500 |
| commit | 702f0fb822d40f0e004df1cdf3d9c2079ddc98e5 (patch) | |
| tree | 0dd822004be00402b84a9537506b9de3fd0bf5b6 /config | |
| parent | 93638935d783c092dabac51982426ebd98a21e0e (diff) | |
| parent | a6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff) | |
| download | pleroma-702f0fb822d40f0e004df1cdf3d9c2079ddc98e5.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into mrf-silence
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 48fe7c669..4b91a58b7 100644 --- 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, diff --git a/config/description.exs b/config/description.exs index dc6e2a76e..99cbc04db 100644 --- a/config/description.exs +++ b/config/description.exs @@ -662,6 +662,11 @@ config :pleroma, :config_description, [ 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, description: "Enable federation with other instances" @@ -875,6 +880,14 @@ config :pleroma, :config_description, [ ] }, %{ + key: :registration_reason_length, + type: :integer, + description: "Maximum registration reason length. Default: 500.", + suggestions: [ + 500 + ] + }, + %{ key: :external_user_synchronization, type: :boolean, description: "Enabling following/followers counters synchronization for external users" |