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-01-26 17:54:50 +0000 |
| commit | ed0aa3f61c295d4d38ee643a4b3257f890f50686 (patch) | |
| tree | 439143124eb39b802fb1f5e5e3affc7c3da89ce2 | |
| parent | 9d7999242db6ab641df1351bae7cfd5766cfeaa3 (diff) | |
| download | gitlab-ce-ed0aa3f61c295d4d38ee643a4b3257f890f50686.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 c3a6096aa54..07592a169b9 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -16,10 +16,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) |