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/views/shared/_issuable_meta_data.html.haml | |
| 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/views/shared/_issuable_meta_data.html.haml')
| -rw-r--r-- | app/views/shared/_issuable_meta_data.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/shared/_issuable_meta_data.html.haml b/app/views/shared/_issuable_meta_data.html.haml index 435acbc634c..430d9a9dd76 100644 --- a/app/views/shared/_issuable_meta_data.html.haml +++ b/app/views/shared/_issuable_meta_data.html.haml @@ -5,21 +5,21 @@ - issuable_mr = @issuable_meta_data[issuable.id].merge_requests_count - if issuable_mr > 0 - %li.issuable-mr.hidden-xs + %li.issuable-mr.hidden-xs.has-tooltip{ title: _('Related merge requests') } = image_tag('icon-merge-request-unmerged.svg', class: 'icon-merge-request-unmerged') = issuable_mr - if upvotes > 0 - %li.issuable-upvotes.hidden-xs + %li.issuable-upvotes.hidden-xs.has-tooltip{ title: _('Upvotes') } = icon('thumbs-up') = upvotes - if downvotes > 0 - %li.issuable-downvotes.hidden-xs + %li.issuable-downvotes.hidden-xs.has-tooltip{ title: _('Downvotes') } = icon('thumbs-down') = downvotes %li.issuable-comments.hidden-xs - = link_to issuable_url, class: ('no-comments' if note_count.zero?) do + = link_to issuable_url, class: ['has-tooltip', ('no-comments' if note_count.zero?)], title: _('Comments') do = icon('comments') = note_count |