Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

3 files changed, 4 insertions, 4 deletions

diff --git a/lib/gitlab/git/cross_repo_comparer.rb b/lib/gitlab/git/cross_repo_comparer.rb
index 3958373f7cb..d42b2a3bd98 100644
--- a/lib/gitlab/git/cross_repo_comparer.rb
+++ b/lib/gitlab/git/cross_repo_comparer.rb
@@ -45,7 +45,7 @@ module Gitlab
       # name that will be deleted once the method completes. This is a no-op if
       # fetching the source branch fails
       def with_commit_in_source_tmp(commit_id, &blk)
-        tmp_ref = "refs/tmp/#{SecureRandom.hex}"
+        tmp_ref = "refs/#{::Repository::REF_TMP}/#{SecureRandom.hex}"
 
         yield commit_id if source_repo.fetch_source_branch!(target_repo, commit_id, tmp_ref)
       ensure
diff --git a/lib/gitlab/git/diff.rb b/lib/gitlab/git/diff.rb
index c473fe6973d..003cc87d65a 100644
--- a/lib/gitlab/git/diff.rb
+++ b/lib/gitlab/git/diff.rb
@@ -44,7 +44,7 @@ module Gitlab
                           else
                             # Only show what is new in the source branch
                             # compared to the target branch, not the other way
-                            # around. The linex below with merge_base is
+                            # around. The line below with merge_base is
                             # equivalent to diff with three dots (git diff
                             # branch1...branch2) From the git documentation:
                             # "git diff A...B" is equivalent to "git diff
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index ab365069adf..df744bd60b4 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -366,9 +366,9 @@ module Gitlab
         end
       end
 
-      def new_commits(newrevs, allow_quarantine: false)
+      def new_commits(newrevs)
         wrapped_gitaly_errors do
-          gitaly_commit_client.list_new_commits(Array.wrap(newrevs), allow_quarantine: allow_quarantine)
+          gitaly_commit_client.list_new_commits(Array.wrap(newrevs))
         end
       end