Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 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
diff --git a/lib/gitlab/auth/auth_finders.rb b/lib/gitlab/auth/auth_finders.rb
index 7adaaef86e4..c994f179b66 100644
--- a/lib/gitlab/auth/auth_finders.rb
+++ b/lib/gitlab/auth/auth_finders.rb
@@ -103,7 +103,7 @@ module Gitlab
         return unless has_basic_credentials?(current_request)
 
         login, token = user_name_and_password(current_request)
-        user = User.by_login(login)
+        user = User.find_by_login(login)
 
         user if user && Gitlab::LfsToken.new(user).token_valid?(token)
       end