diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 18:08:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 18:08:31 +0000 |
| commit | 92f95ccac81911d1fcc32e999a7f1ce04624a56c (patch) | |
| tree | ad207e86b7858ae93a085fbdc04155f5cd469620 /app/helpers/application_settings_helper.rb | |
| parent | 85e494935a8726dc98bb19ffa584488420e5011e (diff) | |
| download | gitlab-ce-92f95ccac81911d1fcc32e999a7f1ce04624a56c.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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 7115fd834fd..077035a49ed 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -202,6 +202,7 @@ module ApplicationSettingsHelper :enabled_git_access_protocol, :enforce_terms, :first_day_of_week, + :force_pages_access_control, :gitaly_timeout_default, :gitaly_timeout_medium, :gitaly_timeout_fast, |