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

Fix settings

Browse source
This commit is contained in:
Riyad Preukschas 2013-01-16 23:54:48 +01:00
parent eea43c9412
commit 76329a46a3
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/initializers/1_settings.rb
View file

@ -50,7 +50,7 @@ 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)
Settings.gitlab['user'] ||= 'gitlab'
Settings.gitlab['user'] ||= 'gitlab'
Settings['gravatar'] ||= Settingslogic.new({})
Settings.gravatar['enabled'] ||= true
@ -68,7 +68,7 @@ Settings.gitolite['upload_pack'] ||= (Settings.gitolite['upload_pack'] != false
Settings.gitolite['ssh_host'] ||= (Settings.gitlab.host || 'localhost')
Settings.gitolite['ssh_port'] ||= 22
Settings.gitolite['ssh_user'] ||= 'git'
Settings.gitolite['group'] ||= 'git'
Settings.gitolite['owner_group'] ||= Settings.gitolite.ssh_user
Settings.gitolite['ssh_path_prefix'] ||= Settings.send(:build_gitolite_ssh_path_prefix)
Settings['backup'] ||= Settingslogic.new({})
@ -81,4 +81,4 @@ Settings.git['bin_path'] ||= '/usr/bin/git'
Settings.git['timeout'] ||= 10
Settings['satellites'] ||= Settingslogic.new({})
Settings.satellites['path'] ||= Rails.root.join('tmp/repo_satellites/')
Settings.satellites['path'] = File.expand_path(Settings.satellites['path'] || "tmp/repo_satellites/", Rails.root)