Download as
Browse Code »

Commit dfb8d2b7ff5390ad1689fb98c5ddd3b10194f480

Authored by David Pursehouse
1 parent 00d6ac29
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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.
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 @dfb8d2b
@@ -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?