summaryrefslogtreecommitdiff
path: root/lib/api/settings.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-18 00:08:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-18 00:08:58 +0000
commit099333e261623df9b960419e2761b2cbb0eb3882 (patch)
tree47d05cc18d6b20a16982b33e00bd1d144563f9e3 /lib/api/settings.rb
parenta0b4a462b0c6f333651ae9e0c0ca1e5794e7b4e1 (diff)
downloadgitlab-ce-099333e261623df9b960419e2761b2cbb0eb3882.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/settings.rb')
-rw-r--r--lib/api/settings.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb
index 64a72b4cb7f..95d0c525ced 100644
--- a/lib/api/settings.rb
+++ b/lib/api/settings.rb
@@ -30,6 +30,7 @@ module API
success Entities::ApplicationSetting
end
params do
+ optional :admin_mode, type: Boolean, desc: 'Require admin users to re-authenticate for administrative (i.e. potentially dangerous) operations'
optional :admin_notification_email, type: String, desc: 'Deprecated: Use :abuse_notification_email instead. Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area.'
optional :abuse_notification_email, type: String, desc: 'Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area.'
optional :after_sign_up_text, type: String, desc: 'Text shown after sign up'