summaryrefslogtreecommitdiff
path: root/config/initializers/devise.rb
diff options
context:
space:
mode:
authorIzaak Alpert <ialpert@blackberry.com>2013-06-26 10:49:29 -0400
committerIzaak Alpert <ialpert@blackberry.com>2013-07-18 09:33:12 -0400
commit1a31cb2c379291680cc67dad12f78294000632e3 (patch)
treecfcf1e5129741346efa37271282ef2ef786b7331 /config/initializers/devise.rb
parent089605fe6b9850ff87e1b1535d084b73e305d627 (diff)
downloadgitlab-ce-1a31cb2c379291680cc67dad12f78294000632e3.tar.gz
Update the proc/lamda to be consistent
Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3
Diffstat (limited to 'config/initializers/devise.rb')
-rw-r--r--config/initializers/devise.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 52f757fdc94..39c1b7c235b 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -207,11 +207,11 @@ Devise.setup do |config|
if Gitlab.config.ldap.enabled
if Gitlab.config.ldap.allow_username_or_email_login
- email_stripping_proc = Proc.new {|name| name.gsub(/@.*$/,'')}
+ email_stripping_proc = ->(name) {name.gsub(/@.*$/,'')}
else
- email_stripping_proc = lambda {|n|n}
-
+ email_stripping_proc = ->(name) {name}
end
+
config.omniauth :ldap,
host: Gitlab.config.ldap['host'],
base: Gitlab.config.ldap['base'],