diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-16 21:09:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-16 21:09:47 +0300 |
| commit | bf1600d157465f9408aace91073954fd5790c054 (patch) | |
| tree | f317bb99330769c4eb37621c860af014810e554b /app/helpers/application_settings_helper.rb | |
| parent | 6de7d2c195a8a7fa5702cafa4365f7a9fcac37cd (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index b56453d60e9..9245cc1cb1c 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -222,6 +222,8 @@ module ApplicationSettingsHelper :gitaly_timeout_default, :gitaly_timeout_medium, :gitaly_timeout_fast, + :gitpod_enabled, + :gitpod_url, :grafana_enabled, :grafana_url, :gravatar_enabled, |