Default allow username or email login to false

-If not specified in the gitlab.yml default this setting to false

Change-Id: I3551df364498dd84ccbd18c90797522e77159f05
This commit is contained in:
Izaak Alpert
2013-07-18 09:33:12 -04:00
parent 1a31cb2c37
commit d04f32866f
+2
View File
@@ -37,6 +37,8 @@ end
# Default settings
Settings['ldap'] ||= Settingslogic.new({})
Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil?
Settings.ldap['allow_username_or_email_login'] = false if Settings.ldap['allow_username_or_email_login'].nil?
Settings['omniauth'] ||= Settingslogic.new({})
Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil?