Download as
Browse Code »

Commit c938833bd9f5373af5b8012df39a360517fd5261

Authored by Dmitriy Zaporozhets
2 parents 875728b1 adb58e36
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
app/views/projects/merge_requests/show/_mr_box.html.haml
  Diff comments   View file @c938833
@@ -13,13 +13,14 @@ @@ -13,13 +13,14 @@
13 .ui-box-body 13 .ui-box-body
14 %div 14 %div
15 %cite.cgray 15 %cite.cgray
16 - Created on #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)} 16 + Created on #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}.
17 - if @merge_request.assignee 17 - if @merge_request.assignee
18 - \, currently assigned to #{link_to_member(@project, @merge_request.assignee)} 18 + Currently assigned to #{link_to_member(@project, @merge_request.assignee)}.
19 - if @merge_request.milestone 19 - if @merge_request.milestone
20 - milestone = @merge_request.milestone 20 - milestone = @merge_request.milestone
21 - %cite.cgray and attached to milestone 21 + %cite.cgray Attached to milestone
22 %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone) 22 %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
  23 + \.
23 24
24 25
25 - if @merge_request.description.present? 26 - if @merge_request.description.present?