kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix pages path settings option.

This commit is contained in:
Kamil Trzcinski 2015-12-18 16:40:59 +01:00 committed by James Edwards-Jones
parent 6c9ba469d9
commit 324fe12a12
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/1_settings.rb
View File

@ -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