Commit a908edacacb4d6465b3d4cf4b99f3ecaf08eb8be
1 parent
1a0082b4
Exists in
master
and in
4 other branches
Show CI status even for closed MR. Use green bg for "Merged by username" message…
… and red for closed one
Showing
2 changed files
with
7 additions
and
5 deletions
Show diff stats
app/views/merge_requests/show/_mr_box.html.haml
| 1 | 1 | .ui-box.ui-box-show |
| 2 | 2 | .ui-box-head |
| 3 | 3 | %h4.box-title |
| 4 | + = gfm escape_once(@merge_request.title) | |
| 4 | 5 | - if @merge_request.merged? |
| 5 | 6 | .error.status_info |
| 6 | 7 | %i.icon-ok |
| 7 | 8 | Merged |
| 8 | 9 | - elsif @merge_request.closed? |
| 9 | 10 | .error.status_info Closed |
| 10 | - = gfm escape_once(@merge_request.title) | |
| 11 | 11 | |
| 12 | 12 | .ui-box-body |
| 13 | 13 | %div |
| ... | ... | @@ -22,13 +22,15 @@ |
| 22 | 22 | |
| 23 | 23 | |
| 24 | 24 | - if @merge_request.closed? |
| 25 | - .ui-box-bottom | |
| 25 | + .ui-box-bottom.alert-error | |
| 26 | 26 | %span |
| 27 | + %i.icon-remove | |
| 27 | 28 | Closed by #{link_to_member(@project, @merge_request.closed_event.author)} |
| 28 | 29 | %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. |
| 29 | 30 | - if @merge_request.merged? |
| 30 | - .ui-box-bottom | |
| 31 | + .ui-box-bottom.alert-success | |
| 31 | 32 | %span |
| 33 | + %i.icon-ok | |
| 32 | 34 | Merged by #{link_to_member(@project, @merge_request.merge_event.author)} |
| 33 | - %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago. | |
| 35 | + #{time_ago_in_words(@merge_request.merge_event.created_at)} ago. | |
| 34 | 36 | ... | ... |
app/views/merge_requests/show/_mr_ci.html.haml