diff options
| author | Pedro Moreira da Silva <pedro@gitlab.com> | 2017-01-26 17:54:50 +0000 |
|---|---|---|
| committer | Pedro Moreira da Silva <pedro@gitlab.com> | 2017-02-24 17:07:43 +0000 |
| commit | 3a1fff9c62c8ebbd5ecd7ede2c7960cd048a7c48 (patch) | |
| tree | 8d44a5ee733490d6b185af54e82e93e4ee9f4b30 | |
| parent | 9f6660b1a930023007b8a3c0bf3850160575d058 (diff) | |
| download | gitlab-ce-3a1fff9c62c8ebbd5ecd7ede2c7960cd048a7c48.tar.gz | |
Format milestone header as issues and MRs
* Enclose the identifier in strong
* Use the % character as in GFM
* Remove spaces around en dash for date range
| -rw-r--r-- | app/helpers/milestones_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index 729928ce1dd..7011e670cee 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -97,7 +97,7 @@ module MilestonesHelper def milestone_date_range(milestone) if milestone.start_date && milestone.due_date - "#{milestone.start_date.to_s(:medium)} - #{milestone.due_date.to_s(:medium)}" + "#{milestone.start_date.to_s(:medium)}–#{milestone.due_date.to_s(:medium)}" elsif milestone.due_date if milestone.due_date.past? "expired on #{milestone.due_date.to_s(:medium)}" diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 06a31698ee6..a216d59bc74 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -19,10 +19,9 @@ Open .header-text-content %span.identifier - Milestone ##{@milestone.iid} + %strong + Milestone %#{@milestone.iid} - if @milestone.due_date || @milestone.start_date - %span.creator - · = milestone_date_range(@milestone) .milestone-buttons - if can?(current_user, :admin_milestone, @project) |