diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-20 11:03:22 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-20 11:03:22 +0300 |
| commit | 36dc65d5ca34234faf8e79106ed081a28659d899 (patch) | |
| tree | 72545a16025bfd82d0b606e0891bb3588b3dce1d /app/helpers | |
| parent | 020196a26c8cd2f6e4546b59ee4f22a4df0defbf (diff) | |
| parent | 8323b9c98d63efe38a2db736d73bc65059db1ada (diff) | |
Merge branch 'add_tooltip_for_milestone_in_issues_list' into 'master'
Add tooltip for milestone due date to issue and merge request lists
Closes #18864
See merge request gitlab-org/gitlab-ce!14318
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/milestones_helper.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index 446a59030a6..be8cb358de2 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -94,6 +94,12 @@ module MilestonesHelper end end + def milestone_tooltip_title(milestone) + if milestone.due_date + [milestone.due_date.to_s(:medium), "(#{milestone_remaining_days(milestone)})"].join(' ') + end + end + def milestone_remaining_days(milestone) if milestone.expired? content_tag(:strong, 'Past due') |