diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-06-12 01:15:59 +0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-18 17:33:12 +0400 |
| commit | 089605fe6b9850ff87e1b1535d084b73e305d627 (patch) | |
| tree | ddd49b17e9d701579e1ada4ccfaefd9485913adb /config/initializers/devise.rb | |
| parent | 2c191ab06c61b839c3addf6b2f7e5660675908a2 (diff) | |
Allow the ldap logins with email or username
Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4
Diffstat (limited to 'config/initializers/devise.rb')
| -rw-r--r-- | config/initializers/devise.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index e0938a9640c..52f757fdc94 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -206,6 +206,12 @@ Devise.setup do |config| # end if Gitlab.config.ldap.enabled + if Gitlab.config.ldap.allow_username_or_email_login + email_stripping_proc = Proc.new {|name| name.gsub(/@.*$/,'')} + else + email_stripping_proc = lambda {|n|n} + + end config.omniauth :ldap, host: Gitlab.config.ldap['host'], base: Gitlab.config.ldap['base'], @@ -213,7 +219,8 @@ Devise.setup do |config| port: Gitlab.config.ldap['port'], method: Gitlab.config.ldap['method'], bind_dn: Gitlab.config.ldap['bind_dn'], - password: Gitlab.config.ldap['password'] + password: Gitlab.config.ldap['password'], + name_proc: email_stripping_proc end Gitlab.config.omniauth.providers.each do |provider| |