Commit 6dc8c0ea authored by Riyad Preukschas's avatar Riyad Preukschas

Make MRs also count and display its commits' notes

parent 77bde9a0
...@@ -186,6 +186,11 @@ class MergeRequest < ActiveRecord::Base ...@@ -186,6 +186,11 @@ class MergeRequest < ActiveRecord::Base
patch_path patch_path
end end
def mr_and_commit_notes
commit_ids = commits.map(&:id)
Note.where("(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND noteable_id IN (:commit_ids))", mr_id: id, commit_ids: commit_ids)
end
end end
# == Schema Information # == Schema Information
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
- if merge_request.notes.any? - if merge_request.notes.any?
%span.btn.small.disabled.grouped %span.btn.small.disabled.grouped
%i.icon-comment %i.icon-comment
= merge_request.notes.count = merge_request.mr_and_commit_notes.count
%span.btn.small.disabled.grouped %span.btn.small.disabled.grouped
= merge_request.source_branch = merge_request.source_branch
&rarr; &rarr;
......
...@@ -35,4 +35,19 @@ describe MergeRequest do ...@@ -35,4 +35,19 @@ describe MergeRequest do
it { should include_module(IssueCommonality) } it { should include_module(IssueCommonality) }
it { should include_module(Votes) } it { should include_module(Votes) }
end end
describe "#mr_and_commit_notes" do
let!(:merge_request) { Factory.create(:merge_request) }
before do
merge_request.stub(:commits) { [merge_request.project.commit] }
Factory.create(:note, noteable: merge_request.commits.first)
Factory.create(:note, noteable: merge_request)
end
it "should include notes for commits" do
merge_request.commits.should_not be_empty
merge_request.mr_and_commit_notes.count.should == 2
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