Merge branch '487397-backport-17-4' into '17-4-stable-ee'

Check commit message for issue close pattern setting

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166363



Merged-by: Luke Duncalfe <lduncalfe@gitlab.com>
Approved-by: Luke Duncalfe <lduncalfe@gitlab.com>
Co-authored-by: Mario Celi <mcelicalderon@gitlab.com>

app/workers/process_commit_worker.rb

@@ -67,6 +67,7 @@ def issues_to_close(project, commit, user)
     Gitlab::ClosingIssueExtractor
       .new(project, user)
       .closed_by_message(commit.safe_message)
+      .reject { |issue| issue.is_a?(Issue) && !issue.autoclose_by_merged_closing_merge_request? }
   end
   def update_issue_metrics(commit, author)

spec/workers/process_commit_worker_spec.rb

@@ -5,7 +5,8 @@
 RSpec.describe ProcessCommitWorker, feature_category: :source_code_management do
   let_it_be(:user) { create(:user) }
-  let(:project) { create(:project, :public, :repository) }
+  let(:auto_close_issues) { true }
+  let(:project) { create(:project, :public, :repository, autoclose_referenced_issues: auto_close_issues) }
   let(:issue) { create(:issue, project: project, author: user) }
   let(:commit) { project.commit }
@@ -115,6 +116,31 @@
               end
             end
           end
+
+          context 'when project has issue auto close disabled' do
+            let(:auto_close_issues) { false }
+
+            it 'does not close related issues' do
+              expect { perform }.to not_change { Issues::CloseWorker.jobs.size }
+            end
+
+            context 'when issue is an external issue' do
+              let(:issue) { ExternalIssue.new('JIRA-123', project) }
+              let(:project) do
+                create(
+                  :project,
+                  :with_jira_integration,
+                  :public,
+                  :repository,
+                  autoclose_referenced_issues: auto_close_issues
+                )
+              end
+
+              it 'closes issues that should be closed per the commit message' do
+                expect { perform }.to change { Issues::CloseWorker.jobs.size }.by(1)
+              end
+            end
+          end
         end
         context 'when commit has no issue references' do