diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-10 01:10:51 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-10 01:10:51 +0300 |
| commit | dbc4f71868b63a01b2da31d6330a834f05757501 (patch) | |
| tree | 59959719f5407ea851be2373144fac3dcc3c310d /app/views/projects/milestones | |
| parent | 5f803f0fd1676c5a77eaa800c3036729bac0db98 (diff) | |
| parent | 24b64edf09f62645ddfaf96e825cc3ed3a76cf1c (diff) | |
Merge branch 'milestone-tooltip' into 'master'
Add milestone expire date to the right sidebar
## What does this MR do?
Shows milestone expire date tooltip in the sidebar. It also shows the tooltip when sidebar is collapsed.
## Are there points in the code the reviewer needs to double check?
`common_utils.js.coffee` and `milestones_helper.rb` should be reviewed deeply.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/17355
## Screencast
See merge request !4448
Diffstat (limited to 'app/views/projects/milestones')
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 0b0e2bd6868..73772cc0e32 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -6,7 +6,7 @@ - if @milestone.closed? Closed - elsif @milestone.expired? - Expired + Past due - else Open %span.identifier |