Download as
Browse Code »

Commit 803ba84c6b5d601f867ee69b9627252cda82adbf

Authored by Dmitriy Zaporozhets
2 parents 540da508 7a8f0019
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge pull request #6261 from skv-headless/badge_to_labels 

Replace badge to labels, because twbs3 doesn't supprot colored badges
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/views/projects/milestones/_issues.html.haml
  Diff comments   View file @803ba84
... ... @@ -4,7 +4,7 @@
4 4 - issues.each do |issue|
5 5 %li
6 6 = link_to [@project, issue] do
7   - %span.badge{class: issue.closed? ? 'badge-important' : 'badge-info'} ##{issue.iid}
  7 + %span.label{class: issue.closed? ? 'label-danger' : 'label-info'} ##{issue.iid}
8 8 = link_to_gfm truncate(issue.title, length: 40), [@project, issue]
9 9 - if issue.assignee
10 10 .pull-right
... ...
app/views/projects/milestones/_merge_request.html.haml
  Diff comments   View file @803ba84
1 1 %li
2 2 = link_to [@project, merge_request] do
3   - %span.badge.badge-info ##{merge_request.iid}
  3 + %span.label.label-info ##{merge_request.iid}
4 4 –
5 5 = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request]
... ...