Merge pull request #2653 from jouve/fix_default_settings

config/initializers/1_settings.rb

@@ -35,16 +35,16 @@ end
 
 # Default settings
 Settings['ldap'] ||= Settingslogic.new({})
-Settings.ldap['enabled'] ||= false
+Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil?
 
 Settings['omniauth'] ||= Settingslogic.new({})
-Settings.omniauth['enabled']    ||= false
+Settings.omniauth['enabled']      = false if Settings.omniauth['enabled'].nil?
 Settings.omniauth['providers']  ||= []
 
 Settings['gitlab'] ||= Settingslogic.new({})
 Settings.gitlab['default_projects_limit'] ||=  10
 Settings.gitlab['host']       ||= 'localhost'
-Settings.gitlab['https']      ||= false
+Settings.gitlab['https']        = false if Settings.gitlab['https'].nil?
 Settings.gitlab['port']       ||= Settings.gitlab.https ? 443 : 80
 Settings.gitlab['relative_url_root'] ||= ''
 Settings.gitlab['protocol']   ||= Settings.gitlab.https ? "https" : "http"
@@ -53,7 +53,7 @@ Settings.gitlab['url']        ||= Settings.send(:build_gitlab_url)
 Settings.gitlab['user']       ||= 'gitlab'
 
 Settings['gravatar'] ||= Settingslogic.new({})
-Settings.gravatar['enabled']    ||= true
+Settings.gravatar['enabled']      = true if Settings.gravatar['enabled'].nil?
 Settings.gravatar['plain_url']  ||= 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
 Settings.gravatar['ssl_url']    ||= 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
 
@@ -62,9 +62,9 @@ Settings.gitolite['admin_key']    ||= 'gitlab'
 Settings.gitolite['admin_uri']    ||= 'git@localhost:gitolite-admin'
 Settings.gitolite['config_file']  ||= 'gitolite.conf'
 Settings.gitolite['hooks_path']   ||= '/home/git/share/gitolite/hooks/'
-Settings.gitolite['receive_pack'] ||= (Settings.gitolite['receive_pack'] != false)
+Settings.gitolite['receive_pack']   = true if Settings.gitolite['receive_pack'].nil?
+Settings.gitolite['upload_pack']    = true if Settings.gitolite['upload_pack'].nil?
 Settings.gitolite['repos_path']   ||= '/home/git/repositories/'
-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'