Make MRs also count and display its commits' notes

2012-10-05 00:25:40 +02:00 · 2012-10-05 00:25:40 +02:00 · 6dc8c0eac2
commit 6dc8c0eac2
parent 77bde9a0e4
3 changed files with 21 additions and 1 deletions
--- a/app/views/merge_requests/_merge_request.html.haml
+++ b/app/views/merge_requests/_merge_request.html.haml
@ -9,7 +9,7 @@
      - if merge_request.notes.any?
        %span.btn.small.disabled.grouped
          %i.icon-comment
-          = merge_request.notes.count
+          = merge_request.mr_and_commit_notes.count
      %span.btn.small.disabled.grouped
        = merge_request.source_branch
        &rarr;