diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-07-19 14:31:24 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-07-19 14:31:24 +0000 |
| commit | 8291a58124e8f0987b3e17a22ca1123b5dc14f1b (patch) | |
| tree | 72d6682f5925d0d475f1a3cf6770cabff6a2c4dd | |
| parent | b83a4f8327caa93b4857aacceff95d44c214702c (diff) | |
| parent | 6383f71b325cca58b897a41d876dea46aab88cd1 (diff) | |
| download | gitlab-ce-8291a58124e8f0987b3e17a22ca1123b5dc14f1b.tar.gz | |
Merge branch 'add-metadata-to-epic-list-view-ce' into 'master'
Use `issuable_path` helper
See merge request gitlab-org/gitlab-ce!30913
| -rw-r--r-- | app/views/shared/_issuable_meta_data.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/_issuable_meta_data.html.haml b/app/views/shared/_issuable_meta_data.html.haml index 71b13a5d741..7807371285c 100644 --- a/app/views/shared/_issuable_meta_data.html.haml +++ b/app/views/shared/_issuable_meta_data.html.haml @@ -1,7 +1,7 @@ - note_count = @issuable_meta_data[issuable.id].user_notes_count - issue_votes = @issuable_meta_data[issuable.id] - upvotes, downvotes = issue_votes.upvotes, issue_votes.downvotes -- issuable_url = @collection_type == "Issue" ? issue_path(issuable, anchor: 'notes') : merge_request_path(issuable, anchor: 'notes') +- issuable_path = issuable_path(issuable, anchor: 'notes') - issuable_mr = @issuable_meta_data[issuable.id].merge_requests_count(current_user) - if issuable_mr > 0 @@ -20,6 +20,6 @@ = downvotes %li.issuable-comments.d-none.d-sm-block - = link_to issuable_url, class: ['has-tooltip', ('no-comments' if note_count.zero?)], title: _('Comments') do + = link_to issuable_path, class: ['has-tooltip', ('no-comments' if note_count.zero?)], title: _('Comments') do = icon('comments') = note_count |