diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-30 18:10:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-30 18:10:09 +0000 |
| commit | d899d2a373f8be3d94760299faafa19c3c432c1e (patch) | |
| tree | c4648e948c6f8c5428bc0e0046b1dc2200e00402 /lib/api/settings.rb | |
| parent | 69d28d313c2a65ead87229841a50bfc130e8c952 (diff) | |
| download | gitlab-ce-d899d2a373f8be3d94760299faafa19c3c432c1e.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 b40ff469af2..f54b92134dc 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -154,6 +154,7 @@ module API optional :spam_check_endpoint_enabled, type: Boolean, desc: 'Enable Spam Check via external API endpoint' given spam_check_endpoint_enabled: ->(val) { val } do requires :spam_check_endpoint_url, type: String, desc: 'The URL of the external Spam Check service endpoint' + requires :spam_check_api_key, type: String, desc: 'The API key used by GitLab for accessing the Spam Check service endpoint' end optional :terminal_max_session_time, type: Integer, desc: 'Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time.' optional :usage_ping_enabled, type: Boolean, desc: 'Every week GitLab will report license usage back to GitLab, Inc.' |