diff options
author | Nick Thomas <nick@gitlab.com> | 2019-01-24 14:53:05 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-01-24 14:53:05 +0000 |
commit | 71d3bc6349c92ee63696dd1bd78eb2583e8dd588 (patch) | |
tree | 0b2c993c5e5c5daf5f6d9a87192d221cce632b3f /app | |
parent | 6918662b1b5e935254f786f1a2232be38f6eba0d (diff) | |
parent | 8f0bfec7dd1b69745b9f279de6196bf5ba952214 (diff) | |
download | gitlab-ce-71d3bc6349c92ee63696dd1bd78eb2583e8dd588.tar.gz |
Merge branch 'mr-approvals-on-mr-list-ce' into 'master'
CE port of "Display Merge Request approval counts in Merge Request list"
See merge request gitlab-org/gitlab-ce!24500
Diffstat (limited to 'app')
-rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index faa070d0389..02d2dbf0d61 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -56,6 +56,7 @@ - if merge_request.assignee %li = link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: _('Assigned to :name')) + = render_if_exists 'projects/merge_requests/approvals_count', merge_request: merge_request = render 'shared/issuable_meta_data', issuable: merge_request |