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 /app/helpers/application_settings_helper.rb | |
| parent | 69944ffb68788d190e81ff7e33db5dcb6c903184 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 120958eb631..8b3d4fbf96a 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -297,9 +297,7 @@ module ApplicationSettingsHelper :snowplow_iglu_registry_url, :push_event_hooks_limit, :push_event_activities_limit, - :custom_http_clone_url_root, - :pendo_enabled, - :pendo_url + :custom_http_clone_url_root ] end |