diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 21:06:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 21:06:57 +0300 |
| commit | 6d31b8f052d30b7e55128d17b66bceed8c6065a9 (patch) | |
| tree | ca428cf6145af7cfaada94378e66bd5e7cc5a429 /lib/api | |
| parent | 69944ffb68788d190e81ff7e33db5dcb6c903184 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/settings.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 7bf09fd85e2..0669f764d4d 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -147,10 +147,6 @@ module API optional :snowplow_cookie_domain, type: String, desc: 'The Snowplow cookie domain' optional :snowplow_app_id, type: String, desc: 'The Snowplow site name / application id' end - optional :pendo_enabled, type: Grape::API::Boolean, desc: 'Enable Pendo tracking' - given pendo_enabled: ->(val) { val } do - requires :pendo_url, type: String, desc: 'The Pendo url endpoint' - end ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| optional :"#{type}_key_restriction", |