diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-09 14:27:30 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-09 14:27:30 +0000 |
| commit | e17758c25af4c335ed7bc5c8a8422ebc458909ae (patch) | |
| tree | 068934f0d018ebab5f90e610d0c2e6a4c6db0020 | |
| parent | cd83db4c2d00267127c9852ed8996d79fe954042 (diff) | |
| parent | ef848c5ce2beaab7a102a3e8c9484f6aa3461a42 (diff) | |
| download | gitlab-ce-e17758c25af4c335ed7bc5c8a8422ebc458909ae.tar.gz | |
Merge branch 'fix/milestone-summary' into 'master'
Displays milestone remaining days only when it's present
See merge request !7998
| -rw-r--r-- | app/views/shared/milestones/_summary.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-milestone-summary.yml | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/shared/milestones/_summary.html.haml b/app/views/shared/milestones/_summary.html.haml index 0a237136959..d27fba805a3 100644 --- a/app/views/shared/milestones/_summary.html.haml +++ b/app/views/shared/milestones/_summary.html.haml @@ -25,8 +25,10 @@ %span.milestone-stat %strong== #{milestone.percent_complete(current_user)}% complete - %span.milestone-stat - %span.remaining-days= milestone_remaining_days(milestone) + - remaining_days = milestone_remaining_days(milestone) + - if remaining_days.present? + %span.milestone-stat + %span.remaining-days= remaining_days .milestone-progress-buttons %span.tab-issues-buttons diff --git a/changelogs/unreleased/fix-milestone-summary.yml b/changelogs/unreleased/fix-milestone-summary.yml new file mode 100644 index 00000000000..3045a15054c --- /dev/null +++ b/changelogs/unreleased/fix-milestone-summary.yml @@ -0,0 +1,4 @@ +--- +title: Displays milestone remaining days only when it's present +merge_request: +author: |