diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-07 06:11:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-07 06:11:06 +0000 |
| commit | 777dc3053f8433a9f5c9cc868325e16eac5d93e5 (patch) | |
| tree | a48494d384fc4a8ac5a356821844214e0e8a6fc2 /lib/api/settings.rb | |
| parent | 86db9fdda7bc7d0d709c5fef5f7c75a849d6f702 (diff) | |
| download | gitlab-ce-777dc3053f8433a9f5c9cc868325e16eac5d93e5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/settings.rb')
| -rw-r--r-- | lib/api/settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 52fc8c30108..36f816ae638 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -176,6 +176,7 @@ module API optional :require_admin_approval_after_user_signup, type: Boolean, desc: 'Require explicit admin approval for new signups' optional :whats_new_variant, type: String, values: ApplicationSetting.whats_new_variants.keys, desc: "What's new variant, possible values: `all_tiers`, `current_tier`, and `disabled`." optional :floc_enabled, type: Grape::API::Boolean, desc: 'Enable FloC (Federated Learning of Cohorts)' + optional :user_deactivation_emails_enabled, type: Boolean, desc: 'Send emails to users upon account deactivation' ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| optional :"#{type}_key_restriction", |