Commit bbbef273 authored by Dongqing Hu's avatar Dongqing Hu

Remove MergeRequest#closes_issue?; Remove the default parameter value for...

Remove MergeRequest#closes_issue?; Remove the default parameter value for #cache_merge_request_closes_issues! and #issues_mentioned_but_not_closing
parent 821ab7cf
...@@ -541,7 +541,7 @@ class MergeRequest < ActiveRecord::Base ...@@ -541,7 +541,7 @@ class MergeRequest < ActiveRecord::Base
# Calculating this information for a number of merge requests requires # Calculating this information for a number of merge requests requires
# running `ReferenceExtractor` on each of them separately. # running `ReferenceExtractor` on each of them separately.
# This optimization does not apply to issues from external sources. # This optimization does not apply to issues from external sources.
def cache_merge_request_closes_issues!(current_user = self.author) def cache_merge_request_closes_issues!(current_user)
return if project.has_external_issue_tracker? return if project.has_external_issue_tracker?
transaction do transaction do
...@@ -553,10 +553,6 @@ class MergeRequest < ActiveRecord::Base ...@@ -553,10 +553,6 @@ class MergeRequest < ActiveRecord::Base
end end
end end
def closes_issue?(issue)
closes_issues.include?(issue)
end
# Return the set of issues that will be closed if this merge request is accepted. # Return the set of issues that will be closed if this merge request is accepted.
def closes_issues(current_user = self.author) def closes_issues(current_user = self.author)
if target_branch == project.default_branch if target_branch == project.default_branch
...@@ -570,7 +566,7 @@ class MergeRequest < ActiveRecord::Base ...@@ -570,7 +566,7 @@ class MergeRequest < ActiveRecord::Base
end end
end end
def issues_mentioned_but_not_closing(current_user = self.author) def issues_mentioned_but_not_closing(current_user)
return [] unless target_branch == project.default_branch return [] unless target_branch == project.default_branch
ext = Gitlab::ReferenceExtractor.new(project, current_user) ext = Gitlab::ReferenceExtractor.new(project, current_user)
......
...@@ -97,7 +97,7 @@ describe MergeRequest, models: true do ...@@ -97,7 +97,7 @@ describe MergeRequest, models: true do
commit = double('commit1', safe_message: "Fixes #{issue.to_reference}") commit = double('commit1', safe_message: "Fixes #{issue.to_reference}")
allow(subject).to receive(:commits).and_return([commit]) allow(subject).to receive(:commits).and_return([commit])
expect { subject.cache_merge_request_closes_issues! }.to change(subject.merge_requests_closing_issues, :count).by(1) expect { subject.cache_merge_request_closes_issues!(subject.author) }.to change(subject.merge_requests_closing_issues, :count).by(1)
end end
it 'does not cache issues from external trackers' do it 'does not cache issues from external trackers' do
...@@ -106,7 +106,7 @@ describe MergeRequest, models: true do ...@@ -106,7 +106,7 @@ describe MergeRequest, models: true do
commit = double('commit1', safe_message: "Fixes #{issue.to_reference}") commit = double('commit1', safe_message: "Fixes #{issue.to_reference}")
allow(subject).to receive(:commits).and_return([commit]) allow(subject).to receive(:commits).and_return([commit])
expect { subject.cache_merge_request_closes_issues! }.not_to change(subject.merge_requests_closing_issues, :count) expect { subject.cache_merge_request_closes_issues!(subject.author) }.not_to change(subject.merge_requests_closing_issues, :count)
end end
end end
...@@ -300,7 +300,7 @@ describe MergeRequest, models: true do ...@@ -300,7 +300,7 @@ describe MergeRequest, models: true do
allow(subject.project).to receive(:default_branch). allow(subject.project).to receive(:default_branch).
and_return(subject.target_branch) and_return(subject.target_branch)
expect(subject.issues_mentioned_but_not_closing).to match_array([mentioned_issue]) expect(subject.issues_mentioned_but_not_closing(subject.author)).to match_array([mentioned_issue])
end end
end end
......
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