diff --git a/doc/user/project/merge_requests/reviews/index.md b/doc/user/project/merge_requests/reviews/index.md index 3b87e78cfada67c8d1225a30cb28e8e41e367ee8..e5e5dc55adc53a647892a324e730c037f30c5e63 100644 --- a/doc/user/project/merge_requests/reviews/index.md +++ b/doc/user/project/merge_requests/reviews/index.md @@ -148,6 +148,7 @@ DETAILS: > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/430728) in GitLab 16.11 [with a flag](../../../../administration/feature_flags.md) named `mr_reviewer_requests_changes`. Disabled by default. > - Enabled by default [on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/451211) and [self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158226) in GitLab 17.2. +> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/451211) in GitLab 17.3. A reviewer [requesting changes](#submit-a-review) blocks a merge request from merging. When this happens, the merge request reports area shows the message diff --git a/ee/app/models/ee/merge_request.rb b/ee/app/models/ee/merge_request.rb index 01d86262bd2c280a77a2a0d9a59370b5070930eb..dfcd6002e425a1c482b7dea88015cef65f22fcc5 100644 --- a/ee/app/models/ee/merge_request.rb +++ b/ee/app/models/ee/merge_request.rb @@ -501,8 +501,7 @@ def notify_approvers end def reviewer_requests_changes_feature - ::Feature.enabled?(:mr_reviewer_requests_changes, project) && - project.feature_available?(:requested_changes_block_merge_request) + project.feature_available?(:requested_changes_block_merge_request) end def has_changes_requested? diff --git a/ee/config/feature_flags/beta/mr_reviewer_requests_changes.yml b/ee/config/feature_flags/beta/mr_reviewer_requests_changes.yml deleted file mode 100644 index c073a15e20e087811d2f8ceda125e880b9d92802..0000000000000000000000000000000000000000 --- a/ee/config/feature_flags/beta/mr_reviewer_requests_changes.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: mr_reviewer_requests_changes -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430728 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/146895 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/451211 -milestone: '16.11' -group: group::code review -type: beta -default_enabled: true diff --git a/ee/spec/services/merge_requests/mergeability/check_requested_changes_service_spec.rb b/ee/spec/services/merge_requests/mergeability/check_requested_changes_service_spec.rb index 6c44154df43dc0981b9f5ad8bbed12f3f8db9c51..ae1d644a73c0bd91df81e622a90c0acd63f444f0 100644 --- a/ee/spec/services/merge_requests/mergeability/check_requested_changes_service_spec.rb +++ b/ee/spec/services/merge_requests/mergeability/check_requested_changes_service_spec.rb @@ -36,14 +36,6 @@ end end - context 'when feature flag is disabled' do - before do - stub_feature_flags(mr_reviewer_requests_changes: false) - end - - it { expect(result.status).to eq Gitlab::MergeRequests::Mergeability::CheckResult::INACTIVE_STATUS } - end - context 'when license is invalid' do before do stub_licensed_features(requested_changes_block_merge_request: false)