diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-08 03:08:39 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-08 03:08:39 +0000 |
| commit | f77969819ac54a13966f16153cae23a66590cc35 (patch) | |
| tree | 0dcd98d62f691240b94c4b908b19f4385c2ead23 /app/views/projects/merge_requests/_merge_request.html.haml | |
| parent | 5ae54edfa9d6200eb12f831ef56a6e80207ca281 (diff) | |
| download | gitlab-ce-f77969819ac54a13966f16153cae23a66590cc35.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/merge_requests/_merge_request.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 3 |
1 files changed, 3 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 ad0f4d03f9a..d55850b5673 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -55,6 +55,9 @@ - if merge_request.assignees.any? %li.d-flex = render 'shared/issuable/assignees', project: merge_request.project, issuable: merge_request + - if Feature.enabled?(:merge_request_reviewers, @project) && merge_request.reviewers.any? + %li.gl-display-flex.issuable-reviewers + = render 'shared/issuable/reviewers', project: merge_request.project, issuable: merge_request = render 'projects/merge_requests/approvals_count', merge_request: merge_request = render 'shared/issuable_meta_data', issuable: merge_request |