Show CI status even for closed MR. Use green bg for "Merged by username" message and red for closed one

This commit is contained in:
Dmitriy Zaporozhets 2013-04-19 21:50:37 +03:00
parent 1a0082b46b
commit a908edacac
2 changed files with 7 additions and 5 deletions

View file

@ -1,13 +1,13 @@
.ui-box.ui-box-show
.ui-box-head
%h4.box-title
= gfm escape_once(@merge_request.title)
- if @merge_request.merged?
.error.status_info
%i.icon-ok
Merged
- elsif @merge_request.closed?
.error.status_info Closed
= gfm escape_once(@merge_request.title)
.ui-box-body
%div
@ -22,13 +22,15 @@
- if @merge_request.closed?
.ui-box-bottom
.ui-box-bottom.alert-error
%span
%i.icon-remove
Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
- if @merge_request.merged?
.ui-box-bottom
.ui-box-bottom.alert-success
%span
%i.icon-ok
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.

View file

@ -1,4 +1,4 @@
- if @merge_request.opened? && @commits.any?
- if @commits.any?
.ci_widget.ci-success{style: "display:none"}
.alert.alert-success
%i.icon-ok