summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrey Krivko <jastkand@gmail.com>2014-10-22 22:29:26 +0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-30 18:29:18 +0200
commitbafd30f92cfb754fe6864c9cd595df10b52b11f2 (patch)
tree5f46e2435bf87e4b52b4b459bcffe5f2754d3789 /lib
parent8388bbe82918d2fca2600620f48e048ccfab2c97 (diff)
downloadgitlab-ce-bafd30f92cfb754fe6864c9cd595df10b52b11f2.tar.gz
Session API: Use case-insensitive authentication like in UI
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/auth.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index ae33c529b93..30509528b8b 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -1,7 +1,7 @@
module Gitlab
class Auth
def find(login, password)
- user = User.find_by(email: login) || User.find_by(username: login)
+ user = User.by_login(login)
# If no user is found, or it's an LDAP server, try LDAP.
# LDAP users are only authenticated via LDAP