Commit d42b5f4b authored by Stan Hu's avatar Stan Hu

Merge branch 'revert-efc7239c' into 'master'

Revert "Merge branch '245190-enable-mr-reviewers-ff' into 'master'"

See merge request gitlab-org/gitlab!45626
parents 8db8c419 ca279741
...@@ -1691,7 +1691,7 @@ class MergeRequest < ApplicationRecord ...@@ -1691,7 +1691,7 @@ class MergeRequest < ApplicationRecord
end end
def allows_reviewers? def allows_reviewers?
Feature.enabled?(:merge_request_reviewers, project, default_enabled: true) Feature.enabled?(:merge_request_reviewers, project)
end end
def allows_multiple_reviewers? def allows_multiple_reviewers?
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
- if merge_request.assignees.any? - if merge_request.assignees.any?
%li.gl-display-flex.gl-align-items-center %li.gl-display-flex.gl-align-items-center
= render 'shared/issuable/assignees', project: merge_request.project, issuable: merge_request = render 'shared/issuable/assignees', project: merge_request.project, issuable: merge_request
- if Feature.enabled?(:merge_request_reviewers, @project, default_enabled: true) && merge_request.reviewers.any? - if Feature.enabled?(:merge_request_reviewers, @project) && merge_request.reviewers.any?
%li.gl-display-flex.issuable-reviewers %li.gl-display-flex.issuable-reviewers
= render 'shared/issuable/reviewers', project: merge_request.project, issuable: merge_request = render 'shared/issuable/reviewers', project: merge_request.project, issuable: merge_request
= render 'projects/merge_requests/approvals_count', merge_request: merge_request = render 'projects/merge_requests/approvals_count', merge_request: merge_request
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
.block.assignee.qa-assignee-block .block.assignee.qa-assignee-block
= render "shared/issuable/sidebar_assignees", issuable_sidebar: issuable_sidebar, assignees: assignees, signed_in: signed_in = render "shared/issuable/sidebar_assignees", issuable_sidebar: issuable_sidebar, assignees: assignees, signed_in: signed_in
- if Feature.enabled?(:merge_request_reviewers, @project, default_enabled: true) && reviewers - if Feature.enabled?(:merge_request_reviewers, @project) && reviewers
.block.reviewer.qa-reviewer-block .block.reviewer.qa-reviewer-block
= render "shared/issuable/sidebar_reviewers", issuable_sidebar: issuable_sidebar, reviewers: reviewers, signed_in: signed_in = render "shared/issuable/sidebar_reviewers", issuable_sidebar: issuable_sidebar, reviewers: reviewers, signed_in: signed_in
......
...@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40488 ...@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40488
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/245190 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/245190
group: group::source code group: group::source code
type: development type: development
default_enabled: true default_enabled: false
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment