diff options
| author | James Lopez <james@gitlab.com> | 2018-03-22 11:04:03 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2018-03-22 11:04:03 +0000 |
| commit | 2eab1fd2c9a7db1f9cc71a706c5ac0cfdc61c953 (patch) | |
| tree | 1ed85940487b28510f4038923febac6f5ee453c6 /app/helpers | |
| parent | 4d0ec5b1284e45f9b927d354d6408cf174ad243b (diff) | |
| parent | d68ddc8366dec3a9aed357c96446a43d36e5de43 (diff) | |
| download | gitlab-ce-2eab1fd2c9a7db1f9cc71a706c5ac0cfdc61c953.tar.gz | |
Merge branch 'master' into 'latest-security-to-master-21-03-18'
# Conflicts:
# Gemfile
# Gemfile.lock
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/issuables_helper.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index f6ddb6d4cfe..6d6b840f485 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -377,4 +377,11 @@ module IssuablesHelper def parent @project || @group end + + def issuable_milestone_tooltip_title(issuable) + if issuable.milestone + milestone_tooltip = milestone_tooltip_title(issuable.milestone) + _('Milestone') + (milestone_tooltip ? ': ' + milestone_tooltip : '') + end + end end |