Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 16 deletions

diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 31ce37a0607..d7d1278159b 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -1998,10 +1998,6 @@ RSpec.describe Projects::MergeRequestsController do
   describe 'POST export_csv' do
     subject { post :export_csv, params: { namespace_id: project.namespace, project_id: project } }
 
-    before do
-      stub_feature_flags(export_merge_requests_as_csv: project)
-    end
-
     it 'redirects to the merge request index' do
       subject
 
@@ -2014,17 +2010,5 @@ RSpec.describe Projects::MergeRequestsController do
 
       subject
     end
-
-    context 'feature is disabled' do
-      before do
-        stub_feature_flags(export_merge_requests_as_csv: false)
-      end
-
-      it 'expects a 404 response' do
-        subject
-
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
   end
 end