diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2019-07-03 11:55:42 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2019-07-03 11:55:42 +0200 |
| commit | 49d689fb3c7781c861f995aaafef4b224581020b (patch) | |
| tree | d13db636b3756f7985431420f0aae6f0b234b14a /app/views/shared | |
| parent | ab0c3e086f5c0fc3eeb1335bbe4c8de02676dc16 (diff) | |
| parent | bebbb43f7133cc03c3a9944d2a4b9586a6a0d06f (diff) | |
| download | gitlab-ce-49d689fb3c7781c861f995aaafef4b224581020b.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/_issuable_meta_data.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/_issuable_meta_data.html.haml b/app/views/shared/_issuable_meta_data.html.haml index 31a5370a5f8..71b13a5d741 100644 --- a/app/views/shared/_issuable_meta_data.html.haml +++ b/app/views/shared/_issuable_meta_data.html.haml @@ -2,7 +2,7 @@ - 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_mr = @issuable_meta_data[issuable.id].merge_requests_count +- issuable_mr = @issuable_meta_data[issuable.id].merge_requests_count(current_user) - if issuable_mr > 0 %li.issuable-mr.d-none.d-sm-block.has-tooltip{ title: _('Related merge requests') } |