Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/auth.rb')
-rw-r--r--lib/gitlab/auth.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 6c3487c28ea..6213dd203c4 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -92,7 +92,7 @@ module Gitlab
return unless authenticate_using_internal_or_ldap_password?
Gitlab::Auth::UniqueIpsLimiter.limit_user! do
- user = User.by_login(login)
+ user = User.find_by_login(login)
break if user && !user.can_log_in_with_non_expired_password?
@@ -279,7 +279,7 @@ module Gitlab
if deploy_key_matches
DeployKey.find(deploy_key_matches[1])
else
- User.by_login(login)
+ User.find_by_login(login)
end
return unless actor