Commit f8052310 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'merge-request-closes-issues-performance' into 'master'

Optimize fetching issues closed by a merge request

Related issue: #12419

See merge request !2625
parents c3df2087 99492d6b
......@@ -16,6 +16,7 @@ v 8.5.0 (unreleased)
- Track project import failure
- Fix visibility level text in admin area (Zeger-Jan van de Weg)
- Update the ExternalIssue regex pattern (Blake Hitchcock)
- Optimized performance of finding issues to be closed by a merge request
- Revert "Add IP check against DNSBLs at account sign-up"
- Deprecate API "merge_request/:merge_request_id/comments". Use "merge_requests/:merge_request_id/notes" instead
- Deprecate API "merge_request/:merge_request_id/...". Use "merge_requests/:merge_request_id/..." instead
......@@ -346,10 +346,10 @@ def closes_issue?(issue)
# Return the set of issues that will be closed if this merge request is accepted.
def closes_issues(current_user =
if target_branch == project.default_branch
issues = commits.flat_map { |c| c.closes_issues(current_user) }
issues.push(*, current_user).
messages = << description, current_user).
......@@ -137,9 +137,10 @@
describe 'detection of issues to be closed' do
let(:issue0) { create :issue, project: subject.project }
let(:issue1) { create :issue, project: subject.project }
let(:commit0) { double('commit0', closes_issues: [issue0]) }
let(:commit1) { double('commit1', closes_issues: [issue0]) }
let(:commit2) { double('commit2', closes_issues: [issue1]) }
let(:commit0) { double('commit0', safe_message: "Fixes #{issue0.to_reference}") }
let(:commit1) { double('commit1', safe_message: "Fixes #{issue0.to_reference}") }
let(:commit2) { double('commit2', safe_message: "Fixes #{issue1.to_reference}") }
before do
allow(subject).to receive(:commits).and_return([commit0, commit1, commit2])
......@@ -149,7 +150,9 @@
allow(subject.project).to receive(:default_branch).
expect(subject.closes_issues).to eq([issue0, issue1].sort_by(&:id))
closed = subject.closes_issues
expect(closed).to include(issue0, issue1)
it 'only lists issues as to be closed if it targets the default branch' do
......@@ -167,17 +170,6 @@
expect(subject.closes_issues).to include(issue2)
context 'for a project with JIRA integration' do
let(:issue0) {'JIRA-123', subject.project) }
let(:issue1) {'FOOBAR-4567', subject.project) }
it 'returns sorted JiraIssues' do
allow(subject.project).to receive_messages(default_branch: subject.target_branch)
expect(subject.closes_issues).to eq([issue0, issue1])
describe "#work_in_progress?" do
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment