Commit a908edac authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Show CI status even for closed MR. Use green bg for "Merged by username"...

Show CI status even for closed MR. Use green bg for "Merged by username" message and red for closed one
parent 1a0082b4
.ui-box.ui-box-show .ui-box.ui-box-show
.ui-box-head .ui-box-head
%h4.box-title %h4.box-title
= gfm escape_once(@merge_request.title)
- if @merge_request.merged? - if @merge_request.merged?
.error.status_info .error.status_info
%i.icon-ok %i.icon-ok
Merged Merged
- elsif @merge_request.closed? - elsif @merge_request.closed?
.error.status_info Closed .error.status_info Closed
= gfm escape_once(@merge_request.title)
.ui-box-body .ui-box-body
%div %div
...@@ -22,13 +22,15 @@ ...@@ -22,13 +22,15 @@
- if @merge_request.closed? - if @merge_request.closed?
.ui-box-bottom .ui-box-bottom.alert-error
%span %span
%i.icon-remove
Closed by #{link_to_member(@project, @merge_request.closed_event.author)} Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
- if @merge_request.merged? - if @merge_request.merged?
.ui-box-bottom .ui-box-bottom.alert-success
%span %span
%i.icon-ok
Merged by #{link_to_member(@project, @merge_request.merge_event.author)} Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
%small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago. #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
- if @merge_request.opened? && @commits.any? - if @commits.any?
.ci_widget.ci-success{style: "display:none"} .ci_widget.ci-success{style: "display:none"}
.alert.alert-success .alert.alert-success
%i.icon-ok %i.icon-ok
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment