Download as
Browse Code »

Commit 283bf806766c02c8c66230f4c765070b0ed812fb

Authored by randx
1 parent 666cdb22
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Comment icons for Issues, MR lists

Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
app/views/issues/_show.html.haml
  Diff comments   View file @283bf80
... ... @@ -3,7 +3,9 @@
3 3 .icon
4 4 .right
5 5 - if issue.notes.any?
6   - %span.btn.small.disabled.padded= pluralize issue.notes.count, 'note'
  6 + %span.btn.small.disabled.padded
  7 + %i.icon-comment
  8 + = issue.notes.count
7 9 - if can? current_user, :modify_issue, issue
8 10 - if issue.closed
9 11 = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn small padded", :remote => true
... ...
app/views/merge_requests/_merge_request.html.haml
  Diff comments   View file @283bf80
... ... @@ -7,7 +7,9 @@
7 7 %i.icon-ok
8 8 = "MERGED"
9 9 - if merge_request.notes.any?
10   - %span.btn.small.disabled.padded= pluralize merge_request.notes.count, 'note'
  10 + %span.btn.small.disabled.padded
  11 + %i.icon-comment
  12 + = merge_request.notes.count
11 13 %span.btn.small.disabled.padded
12 14 = merge_request.source_branch
13 15 →
... ...