Merge pull request #1629 from riyad/show-notes-indicator-for-commits-and-merge-requests

Show numer of notes for commits and merge requests
2012-10-10 01:45:39 -07:00 · 2012-10-10 01:45:39 -07:00 · dda852a0d5
commit dda852a0d5
parent 60b4c88e3a 6dc8c0eac2
5 changed files with 33 additions and 1 deletions
--- a/app/views/commits/_commit.html.haml
+++ b/app/views/commits/_commit.html.haml
@ -13,3 +13,10 @@
      = time_ago_in_words(commit.committed_date)
      ago
      &nbsp;
+
+    %span.notes_count
+      - notes = @project.commit_notes(commit) + @project.commit_line_notes(commit)
+      - if notes.any?
+        %span.btn.small.disabled.grouped
+          %i.icon-comment
+          = notes.count
--- 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;