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/shared | |
| 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/shared')
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index c7991d53a09..fb906de829a 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -41,7 +41,8 @@ = icon('clock-o') %span - if issuable.milestone - = issuable.milestone.title + %span.has-tooltip{title: milestone_remaining_days(issuable.milestone), data: {container: 'body', html: 1, placement: 'left'}} + = issuable.milestone.title - else None .title.hide-collapsed @@ -52,7 +53,8 @@ .value.bold.hide-collapsed - if issuable.milestone = link_to namespace_project_milestone_path(@project.namespace, @project, issuable.milestone) do - = issuable.milestone.title + %span.has-tooltip{title: milestone_remaining_days(issuable.milestone), data: {container: 'body', html: 1}} + = issuable.milestone.title - else .light None |