Merge branch 'patch-issue-#56683' into 'master'

Process up to 100 commit messages for references when pushing to a new default branch See merge request gitlab-org/gitlab-ce!29511

Merge branch 'patch-issue-#56683' into 'master'
Process up to 100 commit messages for references when pushing to a new default branch See merge request gitlab-org/gitlab-ce!29511
0c4059ef · Douwe Maan · 4eb63d82 · 352b43e0 · 0c4059ef · 0c4059ef
--- a/app/services/git/branch_hooks_service.rb
+++ b/app/services/git/branch_hooks_service.rb
@@ -20,8 +20,7 @@ def commits
      strong_memoize(:commits) do
        if creating_default_branch?
          # The most recent PROCESS_COMMIT_LIMIT commits in the default branch
-          offset = [count_commits_in_branch - PROCESS_COMMIT_LIMIT, 0].max
-          project.repository.commits(params[:newrev], offset: offset, limit: PROCESS_COMMIT_LIMIT)
+          project.repository.commits(params[:newrev], limit: PROCESS_COMMIT_LIMIT)
        elsif creating_branch?
          # Use the pushed commits that aren't reachable by the default branch
          # as a heuristic. This may include more commits than are actually
@@ -84,9 +83,6 @@ def branch_remove_hooks

    # Schedules processing of commit messages
    def enqueue_process_commit_messages
-      # don't process commits for the initial push to the default branch
-      return if creating_default_branch?
-
      limited_commits.each do |commit|
        next unless commit.matches_cross_reference_regex?


--- a/changelogs/unreleased/patch-issue--56683.yml
+++ b/changelogs/unreleased/patch-issue--56683.yml
+---
+title: Process up to 100 commit messages for references when pushing to a new default
+  branch
+merge_request: 29511
+author: Fabio Papa
+type: fixed
--- a/spec/services/git/branch_hooks_service_spec.rb
+++ b/spec/services/git/branch_hooks_service_spec.rb
@@ -287,8 +287,8 @@ def clears_extended_cache
    context 'creating the default branch' do
      let(:oldrev) { Gitlab::Git::BLANK_SHA }

-      it 'does not process commit messages' do
-        expect(ProcessCommitWorker).not_to receive(:perform_async)
+      it 'processes a limited number of commit messages' do
+        expect(ProcessCommitWorker).to receive(:perform_async).once

        service.execute
      end