diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2013-10-24 12:31:12 +0400 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2013-11-12 13:24:03 +0400 |
| commit | dfb8d2b7ff5390ad1689fb98c5ddd3b10194f480 (patch) | |
| tree | c6f634f47c24667257c6a815f075140f546d555a /app | |
| parent | 00d6ac299e073b3117ea9d730fbffa9ef7e3b8a0 (diff) | |
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.
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_box.html.haml | 7 |
1 files 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 e1d0c7c11ec..b1c73b439cc 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? |