diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-16 15:10:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-16 15:10:18 +0000 |
| commit | 6364c14cc1f445d471bca118dca5af5a85b2c5dc (patch) | |
| tree | 2579c5592f207e86ff7a0c5c7499caad723cdec1 /app/views/projects/merge_requests/_merge_request.html.haml | |
| parent | 5a2284f3500088e04cf3a5854fb06dc9db2b6077 (diff) | |
| download | gitlab-ce-6364c14cc1f445d471bca118dca5af5a85b2c5dc.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 2f7b5b93de7..4711143c900 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -55,7 +55,7 @@ - if merge_request.assignees.any? %li.gl-display-flex.gl-align-items-center = render 'shared/issuable/assignees', project: merge_request.project, issuable: merge_request - - if Feature.enabled?(:merge_request_reviewers, @project) && merge_request.reviewers.any? + - if Feature.enabled?(:merge_request_reviewers, @project, default_enabled: true) && 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 |