diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 15:09:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 15:09:52 +0000 |
| commit | a2f36202361dcef1f2c9242929f81a4090b9ce97 (patch) | |
| tree | ba21b187bf565cde47412e89bb1ccde829672dd9 /lib/api/settings.rb | |
| parent | 154523302b10ab5aeb67bde861880a98e3f8117a (diff) | |
| download | gitlab-ce-a2f36202361dcef1f2c9242929f81a4090b9ce97.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 95d0c525ced..b40ff469af2 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -169,6 +169,7 @@ module API optional :raw_blob_request_limit, type: Integer, desc: "Maximum number of requests per minute for each raw path. Set to 0 for unlimited requests per minute." optional :wiki_page_max_content_bytes, type: Integer, desc: "Maximum wiki page content size in bytes" 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`." ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| optional :"#{type}_key_restriction", |