diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2017-02-17 07:03:42 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2017-02-17 07:03:42 +1100 |
| commit | 905fdfba927dcfa32b99d649521a52445bc6838f (patch) | |
| tree | 2c71c618cf675dfc92147d592866b1742f5adf79 /app/views | |
| parent | f02210ca068050f032354b48304cd73d968fb4d8 (diff) | |
| download | gitlab-ce-905fdfba927dcfa32b99d649521a52445bc6838f.tar.gz | |
Add merge request count to each issue on issues list
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/_issuable_meta_data.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/shared/_issuable_meta_data.html.haml b/app/views/shared/_issuable_meta_data.html.haml index 1264e524d86..66310da5cd6 100644 --- a/app/views/shared/_issuable_meta_data.html.haml +++ b/app/views/shared/_issuable_meta_data.html.haml @@ -2,6 +2,12 @@ - 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 + +- if issuable_mr > 0 + %li + = image_tag('icon-merge-request-unmerged', class: 'icon-merge-request-unmerged') + = issuable_mr - if upvotes > 0 %li |