...@@ -26,19 +26,19 @@ ...@@ -26,19 +26,19 @@
= markdown @merge_request.description = markdown @merge_request.description
- if @merge_request.closed? - if @merge_request.closed?
.description .alert.alert-info
%span %span
%i.icon-remove %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)}
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)}. #{time_ago_with_tooltip(@merge_request.closed_event.created_at)}.
- if @merge_request.merged? - if @merge_request.merged?
.description .alert.alert-info
%span %span
%i.icon-ok %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)}
#{time_ago_with_tooltip(@merge_request.merge_event.created_at)}. #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}.
- if !@closes_issues.empty? && @merge_request.opened? - if !@closes_issues.empty? && @merge_request.opened?
.description.alert-info .alert.alert-info.alert-info
%span %span
%i.icon-ok %i.icon-ok
Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'} Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
... ...
......