summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-10-12 08:13:22 -0700
committerStan Hu <stanhu@gmail.com>2015-10-12 08:13:22 -0700
commite12b6f30efef3f607cacc5da51f8c49c3be4643a (patch)
tree4234e19e8d9ef81db813f11554ffc75466caabc8 /lib
parente426c149d25aaf77cecabcbf14b1db4f252eca75 (diff)
parentc8d01fa82ab66a14f47d4ae5163df762c60df7c8 (diff)
downloadgitlab-ce-e12b6f30efef3f607cacc5da51f8c49c3be4643a.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ldap/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
index 1ea7751e27d..4be99dd88c2 100644
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
@@ -35,7 +35,7 @@ module Gitlab
end
def find_by_email
- ::User.find_by(email: auth_hash.email)
+ ::User.find_by(email: auth_hash.email.downcase)
end
def update_user_attributes