Commit 1a31cb2c379291680cc67dad12f78294000632e3
1 parent
089605fe
Exists in
master
and in
4 other branches
Update the proc/lamda to be consistent
Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3
Showing
1 changed file
with
3 additions
and
3 deletions
Show diff stats
config/initializers/devise.rb
| @@ -207,11 +207,11 @@ Devise.setup do |config| | @@ -207,11 +207,11 @@ Devise.setup do |config| | ||
| 207 | 207 | ||
| 208 | if Gitlab.config.ldap.enabled | 208 | if Gitlab.config.ldap.enabled |
| 209 | if Gitlab.config.ldap.allow_username_or_email_login | 209 | if Gitlab.config.ldap.allow_username_or_email_login |
| 210 | - email_stripping_proc = Proc.new {|name| name.gsub(/@.*$/,'')} | 210 | + email_stripping_proc = ->(name) {name.gsub(/@.*$/,'')} |
| 211 | else | 211 | else |
| 212 | - email_stripping_proc = lambda {|n|n} | ||
| 213 | - | 212 | + email_stripping_proc = ->(name) {name} |
| 214 | end | 213 | end |
| 214 | + | ||
| 215 | config.omniauth :ldap, | 215 | config.omniauth :ldap, |
| 216 | host: Gitlab.config.ldap['host'], | 216 | host: Gitlab.config.ldap['host'], |
| 217 | base: Gitlab.config.ldap['base'], | 217 | base: Gitlab.config.ldap['base'], |