diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-07-11 13:05:01 -0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-18 09:33:12 -0400 |
| commit | d04f32866fdcd57b11fe9288f7e96df0ad793a67 (patch) | |
| tree | d6e7ef68b1a5a841888f269eda7bb4950e50de23 /config | |
| parent | 1a31cb2c379291680cc67dad12f78294000632e3 (diff) | |
| download | gitlab-ce-d04f32866fdcd57b11fe9288f7e96df0ad793a67.tar.gz | |
Default allow username or email login to false
-If not specified in the gitlab.yml default this setting to false
Change-Id: I3551df364498dd84ccbd18c90797522e77159f05
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 4afe50f1814..e0207c6f0fc 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? |