diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-10-09 19:38:35 +0200 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-10-09 19:38:35 +0200 |
| commit | 23e81130fb53e7c961a225e6235f5ae8a36ed595 (patch) | |
| tree | 1f482f3045137be04207142e33e0f88a915553e6 /config/initializers/1_settings.rb | |
| parent | c12a78969315a8e25128653df2a7515861010b12 (diff) | |
| parent | ca440758be33c8bec937a249db9b18b3c9734df9 (diff) | |
| download | gitlab-ce-23e81130fb53e7c961a225e6235f5ae8a36ed595.tar.gz | |
Merge remote-tracking branch 'gitlab.com/master' into scheduled-manual-jobs-environment-play-buttons
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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" |