2013-01-04 22:35:31 +01:00
|
|
|
.ui-box.ui-box-show
|
|
|
|
|
.ui-box-head
|
2012-12-13 04:14:05 +01:00
|
|
|
%h4.box-title
|
2012-12-15 11:32:09 +01:00
|
|
|
- if @merge_request.merged
|
|
|
|
|
.error.status_info
|
|
|
|
|
%i.icon-ok
|
|
|
|
|
Merged
|
|
|
|
|
- elsif @merge_request.closed
|
2012-12-13 04:14:05 +01:00
|
|
|
.error.status_info Closed
|
2012-09-20 02:21:12 +02:00
|
|
|
= gfm escape_once(@merge_request.title)
|
2012-06-29 20:55:22 +02:00
|
|
|
|
2013-01-04 22:35:31 +01:00
|
|
|
.ui-box-body
|
2012-06-29 20:55:22 +02:00
|
|
|
%div
|
2012-12-13 04:14:05 +01:00
|
|
|
%cite.cgray
|
|
|
|
|
Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
|
|
|
|
|
- if @merge_request.assignee
|
|
|
|
|
\, currently assigned to #{link_to_member(@project, @merge_request.assignee)}
|
2012-10-26 15:53:45 +02:00
|
|
|
- if @merge_request.milestone
|
|
|
|
|
- milestone = @merge_request.milestone
|
|
|
|
|
%cite.cgray and attached to milestone
|
|
|
|
|
%strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
|
2012-06-29 20:55:22 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
- if @merge_request.closed
|
2013-01-04 22:35:31 +01:00
|
|
|
.ui-box-bottom
|
2012-06-29 20:55:22 +02:00
|
|
|
- if @merge_request.merged?
|
|
|
|
|
%span
|
2012-12-13 04:14:05 +01:00
|
|
|
Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
|
2012-06-29 20:55:22 +02:00
|
|
|
%small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
|
|
|
|
|
- elsif @merge_request.closed_event
|
|
|
|
|
%span
|
2012-12-13 04:14:05 +01:00
|
|
|
Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
|
2012-06-29 20:55:22 +02:00
|
|
|
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
|
|
|
|
|
|
