Default allow username or email login to false

-If not specified in the gitlab.yml default this setting to false Change-Id: I3551df364498dd84ccbd18c90797522e77159f05

Default allow username or email login to false
-If not specified in the gitlab.yml default this setting to false Change-Id: I3551df364498dd84ccbd18c90797522e77159f05
Izaak Alpert
1 parent 1a31cb2c
Showing 1 changed file with 2 additions and 0 deletions Show diff stats
config/initializers/1_settings.rb
@@ -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?
	@@ -37,6 +37,8 @@ end		@@ -37,6 +37,8 @@ end
37	# Default settings	37	# Default settings
38	Settings['ldap'] \|\|= Settingslogic.new({})	38	Settings['ldap'] \|\|= Settingslogic.new({})
39	Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil?	39	Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil?
		40	+Settings.ldap['allow_username_or_email_login'] = false if Settings.ldap['allow_username_or_email_login'].nil?
		41	+
40		42
41	Settings['omniauth'] \|\|= Settingslogic.new({})	43	Settings['omniauth'] \|\|= Settingslogic.new({})
42	Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil?	44	Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil?