Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 13 deletions

diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index f9b76db877b..26f757d5ba0 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -198,7 +198,7 @@ RSpec.describe MergeRequests::RefreshService do
       end
     end
 
-    shared_examples 'Pipelines for merge requests' do
+    context 'Pipelines for merge requests', :sidekiq_inline do
       before do
         stub_ci_pipeline_yaml_file(config)
       end
@@ -364,18 +364,6 @@ RSpec.describe MergeRequests::RefreshService do
       end
     end
 
-    context 'when the code_review_async_pipeline_creation feature flag is on', :sidekiq_inline do
-      it_behaves_like 'Pipelines for merge requests'
-    end
-
-    context 'when the code_review_async_pipeline_creation feature flag is off', :sidekiq_inline do
-      before do
-        stub_feature_flags(code_review_async_pipeline_creation: false)
-      end
-
-      it_behaves_like 'Pipelines for merge requests'
-    end
-
     context 'push to origin repo source branch' do
       let(:refresh_service) { service.new(@project, @user) }
       let(:notification_service) { spy('notification_service') }