Merge branch '32564-fix-double-system-closing-notes' into 'master'
Resolve "Double closing system notes when closing issue with Merge Request" Closes #32546 and #32564 See merge request gitlab-org/gitlab-ce!17035
This commit is contained in:
commit
0b032daa11
|
@ -417,6 +417,10 @@ class Commit
|
|||
!!(title =~ WIP_REGEX)
|
||||
end
|
||||
|
||||
def merged_merge_request?(user)
|
||||
!!merged_merge_request(user)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def commit_reference(from, referable_commit_id, full: false)
|
||||
|
@ -445,10 +449,6 @@ class Commit
|
|||
changes
|
||||
end
|
||||
|
||||
def merged_merge_request?(user)
|
||||
!!merged_merge_request(user)
|
||||
end
|
||||
|
||||
def merged_merge_request_no_cache(user)
|
||||
MergeRequestsFinder.new(user, project_id: project.id).find_by(merge_commit_sha: id) if merge_commit?
|
||||
end
|
||||
|
|
|
@ -23,27 +23,25 @@ class ProcessCommitWorker
|
|||
return unless user
|
||||
|
||||
commit = build_commit(project, commit_hash)
|
||||
|
||||
author = commit.author || user
|
||||
|
||||
process_commit_message(project, commit, user, author, default)
|
||||
|
||||
update_issue_metrics(commit, author)
|
||||
end
|
||||
|
||||
def process_commit_message(project, commit, user, author, default = false)
|
||||
# this is a GitLab generated commit message, ignore it.
|
||||
return if commit.merged_merge_request?(user)
|
||||
|
||||
closed_issues = default ? commit.closes_issues(user) : []
|
||||
|
||||
unless closed_issues.empty?
|
||||
close_issues(project, user, author, commit, closed_issues)
|
||||
end
|
||||
|
||||
close_issues(project, user, author, commit, closed_issues) if closed_issues.any?
|
||||
commit.create_cross_references!(author, closed_issues)
|
||||
end
|
||||
|
||||
def close_issues(project, user, author, commit, issues)
|
||||
# We don't want to run permission related queries for every single issue,
|
||||
# therefor we use IssueCollection here and skip the authorization check in
|
||||
# therefore we use IssueCollection here and skip the authorization check in
|
||||
# Issues::CloseService#execute.
|
||||
IssueCollection.new(issues).updatable_by_user(user).each do |issue|
|
||||
Issues::CloseService.new(project, author)
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix duplicate system notes when merging a merge request.
|
||||
merge_request: 17035
|
||||
author:
|
||||
type: fixed
|
|
@ -508,7 +508,7 @@ module Gitlab
|
|||
@committed_date = Time.at(commit.committer.date.seconds).utc
|
||||
@committer_name = commit.committer.name.dup
|
||||
@committer_email = commit.committer.email.dup
|
||||
@parent_ids = commit.parent_ids
|
||||
@parent_ids = Array(commit.parent_ids)
|
||||
end
|
||||
|
||||
def serialize_keys
|
||||
|
|
|
@ -20,6 +20,32 @@ describe ProcessCommitWorker do
|
|||
worker.perform(project.id, -1, commit.to_hash)
|
||||
end
|
||||
|
||||
context 'when commit is a merge request merge commit' do
|
||||
let(:merge_request) do
|
||||
create(:merge_request,
|
||||
description: "Closes #{issue.to_reference}",
|
||||
source_branch: 'feature-merged',
|
||||
target_branch: 'master',
|
||||
source_project: project)
|
||||
end
|
||||
|
||||
let(:commit) do
|
||||
project.repository.create_branch('feature-merged', 'feature')
|
||||
|
||||
sha = project.repository.merge(user,
|
||||
merge_request.diff_head_sha,
|
||||
merge_request,
|
||||
"Closes #{issue.to_reference}")
|
||||
project.repository.commit(sha)
|
||||
end
|
||||
|
||||
it 'it does not close any issues from the commit message' do
|
||||
expect(worker).not_to receive(:close_issues)
|
||||
|
||||
worker.perform(project.id, user.id, commit.to_hash)
|
||||
end
|
||||
end
|
||||
|
||||
it 'processes the commit message' do
|
||||
expect(worker).to receive(:process_commit_message).and_call_original
|
||||
|
||||
|
@ -48,11 +74,9 @@ describe ProcessCommitWorker do
|
|||
describe '#process_commit_message' do
|
||||
context 'when pushing to the default branch' do
|
||||
it 'closes issues that should be closed per the commit message' do
|
||||
allow(commit).to receive(:safe_message)
|
||||
.and_return("Closes #{issue.to_reference}")
|
||||
allow(commit).to receive(:safe_message).and_return("Closes #{issue.to_reference}")
|
||||
|
||||
expect(worker).to receive(:close_issues)
|
||||
.with(project, user, user, commit, [issue])
|
||||
expect(worker).to receive(:close_issues).with(project, user, user, commit, [issue])
|
||||
|
||||
worker.process_commit_message(project, commit, user, user, true)
|
||||
end
|
||||
|
@ -60,8 +84,7 @@ describe ProcessCommitWorker do
|
|||
|
||||
context 'when pushing to a non-default branch' do
|
||||
it 'does not close any issues' do
|
||||
allow(commit).to receive(:safe_message)
|
||||
.and_return("Closes #{issue.to_reference}")
|
||||
allow(commit).to receive(:safe_message).and_return("Closes #{issue.to_reference}")
|
||||
|
||||
expect(worker).not_to receive(:close_issues)
|
||||
|
||||
|
@ -102,8 +125,7 @@ describe ProcessCommitWorker do
|
|||
|
||||
describe '#update_issue_metrics' do
|
||||
it 'updates any existing issue metrics' do
|
||||
allow(commit).to receive(:safe_message)
|
||||
.and_return("Closes #{issue.to_reference}")
|
||||
allow(commit).to receive(:safe_message).and_return("Closes #{issue.to_reference}")
|
||||
|
||||
worker.update_issue_metrics(commit, user)
|
||||
|
||||
|
@ -113,10 +135,10 @@ describe ProcessCommitWorker do
|
|||
end
|
||||
|
||||
it "doesn't execute any queries with false conditions" do
|
||||
allow(commit).to receive(:safe_message)
|
||||
.and_return("Lorem Ipsum")
|
||||
allow(commit).to receive(:safe_message).and_return("Lorem Ipsum")
|
||||
|
||||
expect { worker.update_issue_metrics(commit, user) }.not_to make_queries_matching(/WHERE (?:1=0|0=1)/)
|
||||
expect { worker.update_issue_metrics(commit, user) }
|
||||
.not_to make_queries_matching(/WHERE (?:1=0|0=1)/)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -128,8 +150,9 @@ describe ProcessCommitWorker do
|
|||
end
|
||||
|
||||
it 'parses date strings into Time instances' do
|
||||
commit = worker
|
||||
.build_commit(project, id: '123', authored_date: Time.now.to_s)
|
||||
commit = worker.build_commit(project,
|
||||
id: '123',
|
||||
authored_date: Time.now.to_s)
|
||||
|
||||
expect(commit.authored_date).to be_an_instance_of(Time)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue