Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 9 deletions

diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 709b5c20c92..1d67574b06d 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -425,16 +425,10 @@ RSpec.describe MergeRequests::UpdateService, :mailer do
           create(:merge_request, :simple, source_project: project, reviewer_ids: [user2.id])
         end
 
-        context 'when merge_request_reviewer feature is enabled' do
-          before do
-            stub_feature_flags(merge_request_reviewer: true)
-          end
+        let(:opts) { { reviewer_ids: [IssuableFinder::Params::NONE] } }
 
-          let(:opts) { { reviewer_ids: [IssuableFinder::Params::NONE] } }
-
-          it 'removes reviewers' do
-            expect(update_merge_request(opts).reviewers).to eq []
-          end
+        it 'removes reviewers' do
+          expect(update_merge_request(opts).reviewers).to eq []
         end
       end
     end