diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 21:06:41 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 21:06:41 +0000 |
| commit | da35510cdad8f8d3cb6c119682dc2735531983cd (patch) | |
| tree | d42432c9ddc0d55a3c6316cdb539af11244a148f /app/helpers/application_settings_helper.rb | |
| parent | 7f82744e89f22bdd2d13f85ca4dc66e088f3da5c (diff) | |
| download | gitlab-ce-da35510cdad8f8d3cb6c119682dc2735531983cd.tar.gz | |
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 115d1031a8a..df17b82412f 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -291,7 +291,8 @@ module ApplicationSettingsHelper :snowplow_enabled, :snowplow_site_id, :push_event_hooks_limit, - :push_event_activities_limit + :push_event_activities_limit, + :custom_http_clone_url_root ] end |