Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

2 files changed, 5 insertions, 1 deletions

diff --git a/lib/gitlab/auth/auth_finders.rb b/lib/gitlab/auth/auth_finders.rb
index a7312ac759a..f6ee08defcf 100644
--- a/lib/gitlab/auth/auth_finders.rb
+++ b/lib/gitlab/auth/auth_finders.rb
@@ -338,6 +338,10 @@ module Gitlab
         Gitlab::PathRegex.repository_git_route_regex.match?(current_request.path)
       end
 
+      def git_lfs_request?
+        Gitlab::PathRegex.repository_git_lfs_route_regex.match?(current_request.path)
+      end
+
       def archive_request?
         current_request.path.include?('/-/archive/')
       end
diff --git a/lib/gitlab/auth/o_auth/user.rb b/lib/gitlab/auth/o_auth/user.rb
index 1c5ded2e8ed..feb5fea4c85 100644
--- a/lib/gitlab/auth/o_auth/user.rb
+++ b/lib/gitlab/auth/o_auth/user.rb
@@ -54,7 +54,7 @@ module Gitlab
 
           Users::UpdateService.new(gl_user, user: gl_user).execute!
 
-          gl_user.block if block_after_save
+          gl_user.block_pending_approval if block_after_save
 
           log.info "(#{provider}) saving user #{auth_hash.email} from login with admin => #{gl_user.admin}, extern_uid => #{auth_hash.uid}"
           gl_user