diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-13 06:14:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-13 06:14:51 +0000 |
| commit | 2d2181e35c3cff3411870100cd57c0ed8d95ec20 (patch) | |
| tree | af6595ae56ada2e1ff8975e295aa60e0f1dd42e5 /lib/api/settings.rb | |
| parent | 8cc88269ff15fbe58ffad1f793478344d45a0403 (diff) | |
| download | gitlab-ce-2d2181e35c3cff3411870100cd57c0ed8d95ec20.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, 0 insertions, 1 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 12e1d21a00d..508ccdb4b33 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -154,7 +154,6 @@ 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.' |