deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added RAILS_RELATIVE_URL_ROOT support

Browse source
This commit is contained in:
Chris Frohoff 2012-12-28 18:11:28 +00:00
parent e9394c48ca
commit 21e55ca318
7 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/initializers/1_settings.rb
View file

@ -25,7 +25,8 @@ class Settings < Settingslogic
[ gitlab.protocol,
"://",
gitlab.host,
custom_port
custom_port,
gitlab.relative_url_root
].join('')
end
end
@ -45,6 +46,7 @@ Settings.gitlab['default_projects_limit'] ||= 10
Settings.gitlab['host'] ||= 'localhost'
Settings.gitlab['https'] ||= false
Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
Settings.gitlab['relative_url_root'] ||= ''
Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)