OSDN Git Service

Improve status message on merge request page
authorDavid Pursehouse <david.pursehouse@gmail.com>
Thu, 24 Oct 2013 08:31:12 +0000 (17:31 +0900)
committerDavid Pursehouse <david.pursehouse@gmail.com>
Tue, 12 Nov 2013 09:24:03 +0000 (18:24 +0900)
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

index e1d0c7c..b1c73b4 100644 (file)
   .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?