From d04f32866fdcd57b11fe9288f7e96df0ad793a67 Mon Sep 17 00:00:00 2001
From: Izaak Alpert <ialpert@blackberry.com>
Date: Thu, 11 Jul 2013 13:05:01 -0400
Subject: [PATCH] Default allow username or email login to false

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

Change-Id: I3551df364498dd84ccbd18c90797522e77159f05
---
 config/initializers/1_settings.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 4afe50f181..e0207c6f0f 100644
--- a/config/initializers/1_settings.rb
+++ b/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?