diff options
| author | Tuomo Ala-Vannesluoma <tuomoav@gmail.com> | 2018-10-05 13:41:11 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-10-05 13:41:11 +0000 |
| commit | c84b60b1645950a30fdbc37c9065a200dc750d90 (patch) | |
| tree | 76d523f37481fa1422f63e96e2a1777d48060b9c /config | |
| parent | c972f2e459a6b45852a3d4e76566cdf772a6764a (diff) | |
| download | gitlab-ce-c84b60b1645950a30fdbc37c9065a200dc750d90.tar.gz | |
Make GitLab pages support access control
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 1 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 67337f4b82f..749cdd0f869 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -210,6 +210,7 @@ production: &base ## GitLab Pages pages: enabled: false + access_control: false # The location where pages are stored (default: shared/pages). # path: shared/pages diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 0caa4962128..bd02b85c7ce 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -200,6 +200,7 @@ Settings.registry['path'] = Settings.absolute(Settings.registry['path # Settings['pages'] ||= Settingslogic.new({}) Settings.pages['enabled'] = false if Settings.pages['enabled'].nil? +Settings.pages['access_control'] = false if Settings.pages['access_control'].nil? Settings.pages['path'] = Settings.absolute(Settings.pages['path'] || File.join(Settings.shared['path'], "pages")) Settings.pages['https'] = false if Settings.pages['https'].nil? Settings.pages['host'] ||= "example.com" |