diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-12-18 16:40:59 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-01-31 22:53:56 +0000 |
| commit | 324fe12a125b1a766978556d7d8f2b8bb6c22e43 (patch) | |
| tree | 17df1ea4fc478ec298c045517bc7072633cae562 /config/initializers/1_settings.rb | |
| parent | 6c9ba469d9538c58434db492c0a955c20aba2ba1 (diff) | |
| download | gitlab-ce-324fe12a125b1a766978556d7d8f2b8bb6c22e43.tar.gz | |
Fix pages path settings option.
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index e52171f0d64..860cafad325 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -267,7 +267,7 @@ Settings.registry['path'] = File.expand_path(Settings.registry['path' # Settings['pages'] ||= Settingslogic.new({}) Settings.pages['enabled'] = false if Settings.pages['enabled'].nil? -Settings.pages['path'] ||= File.expand_path('shared/pages/', Rails.root) +Settings.pages['path'] = File.expand_path(Settings.pages['path'] || File.join(Settings.shared['path'], "pages"), Rails.root) Settings.pages['host'] ||= "example.com" Settings.pages['https'] = false if Settings.pages['https'].nil? Settings.pages['port'] ||= Settings.pages.https ? 443 : 80 |