diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-12-17 15:33:43 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-01-31 22:50:40 +0000 |
| commit | f8b0d06b3d341b822c6a2b7f54c979f7c0e86b94 (patch) | |
| tree | 974e7eb7e0e2858b46a1dedea197b716dfbe7892 | |
| parent | f934460e81d954afb10049d4d596744e1e7b0cab (diff) | |
| download | gitlab-ce-f8b0d06b3d341b822c6a2b7f54c979f7c0e86b94.tar.gz | |
Fix pages storage path
| -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 842ea94c5a4..e52171f0d64 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('shared/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 |