diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-10-10 12:45:39 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-10-10 12:45:39 +0400 |
| commit | dda852a0d5c9e684b82cf20380d2b26da1798ecb (patch) | |
| tree | 4f9168c033f56995e821537a3d7e8a1dec578430 /app/views | |
| parent | 60b4c88e3a175fa8b1fdebede4a5c5f73df0eee5 (diff) | |
| parent | 6dc8c0eac28d826a4a58bcb3cdac070f3de2a10c (diff) | |
Merge pull request #1629 from riyad/show-notes-indicator-for-commits-and-merge-requests
Show numer of notes for commits and merge requests
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/commits/_commit.html.haml | 7 | ||||
| -rw-r--r-- | app/views/merge_requests/_merge_request.html.haml | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/views/commits/_commit.html.haml b/app/views/commits/_commit.html.haml index 259e8e26260..9abadc5d807 100644 --- 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 + + %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 diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml index 9d94d670525..419419d2b0f 100644 --- 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 → |