Commit 6880ace1feff9fdd390099026882fe4af3e4b742
1 parent
a3cdaeef
Exists in
master
and in
4 other branches
Fix bug showing merge MR in milestone open list
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
app/views/milestones/show.html.haml
| @@ -77,7 +77,7 @@ | @@ -77,7 +77,7 @@ | ||
| 77 | %li=link_to('All Merge Requests', '#') | 77 | %li=link_to('All Merge Requests', '#') |
| 78 | %ul.well-list | 78 | %ul.well-list |
| 79 | - @merge_requests.each do |merge_request| | 79 | - @merge_requests.each do |merge_request| |
| 80 | - %li{data: {closed: merge_request.closed?}} | 80 | + %li{data: {closed: merge_request.closed? || merge_request.merged?}} |
| 81 | = link_to [@project, merge_request] do | 81 | = link_to [@project, merge_request] do |
| 82 | %span.badge.badge-info ##{merge_request.id} | 82 | %span.badge.badge-info ##{merge_request.id} |
| 83 | – | 83 | – |