diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-07-02 06:19:58 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-07-02 06:19:58 +0000 |
| commit | f66169b35c29294ecc9f63eeeedc52085d2a3fd7 (patch) | |
| tree | 272bcdb2ffd338d82b615e075e721a9043bc323a /app/views/shared | |
| parent | f4cc3db38be9583876e0dffdbeb0f759e4945f5f (diff) | |
| parent | 09163e423ac50c8eda82f67e5419142893faf18a (diff) | |
| download | gitlab-ce-f66169b35c29294ecc9f63eeeedc52085d2a3fd7.tar.gz | |
Merge branch 'security-59581-related-merge-requests-count' into 'master'
Expose merge requests count based on user access
See merge request gitlab/gitlabhq!3157
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') } |