From dfb8d2b7ff5390ad1689fb98c5ddd3b10194f480 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 24 Oct 2013 17:31:12 +0900 Subject: [PATCH] Improve status message on merge request page The status message currently looks like: Created on Oct 24, 2013 by John , currently assigned to Bob There is a space between the author name and the comma, which is incorrect. Also, there is no period at the end of the sentence, which makes it inconsistent with the following line: Merged by Bob 5 minutes ago. Change it to: Created on Oct 24, 2013 by John. Currently assigned to Bob. Also change the milestone information from: and attached to milestone XYZ to: Attached to milestone XYZ. --- app/views/projects/merge_requests/show/_mr_box.html.haml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml index e1d0c7c11..b1c73b439 100644 --- a/app/views/projects/merge_requests/show/_mr_box.html.haml +++ b/app/views/projects/merge_requests/show/_mr_box.html.haml @@ -13,13 +13,14 @@ .ui-box-body %div %cite.cgray - Created on #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)} + Created on #{@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)} + Currently assigned to #{link_to_member(@project, @merge_request.assignee)}. - if @merge_request.milestone - milestone = @merge_request.milestone - %cite.cgray and attached to milestone + %cite.cgray Attached to milestone %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone) + \. - if @merge_request.description.present? -- 2.11.0