diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2017-02-22 17:32:41 +0000 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2017-02-22 17:32:41 +0000 |
| commit | 931db7963ee9fa145d8fe2fb5eea209215227db7 (patch) | |
| tree | a85ddfcf479ea09237c54a6ce9b0557925f583ff /app/views/shared | |
| parent | 0b402e11e355dc8d834fbc139f4bca810a9f766e (diff) | |
| parent | 33e4294fc884c7bd2a7fb86baf4731daf87db7bb (diff) | |
| download | gitlab-ce-api-notes-entity-fields.tar.gz | |
Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fields
# Conflicts:
# doc/api/v3_to_v4.md
Diffstat (limited to 'app/views/shared')
| -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 |