Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 12 deletions

diff --git a/spec/workers/deployments/finished_worker_spec.rb b/spec/workers/deployments/finished_worker_spec.rb
index f0e3439fdfa..2961ff599c3 100644
--- a/spec/workers/deployments/finished_worker_spec.rb
+++ b/spec/workers/deployments/finished_worker_spec.rb
@@ -49,17 +49,5 @@ describe Deployments::FinishedWorker do
 
       expect(ProjectServiceWorker).not_to have_received(:perform_async)
     end
-
-    context 'when the tracking of merge requests is disabled' do
-      it 'does not track the deployed merge requests' do
-        stub_feature_flags(deployment_merge_requests: false)
-
-        deployment = create(:deployment)
-
-        expect(Deployments::LinkMergeRequestsService).not_to receive(:new)
-
-        worker.perform(deployment.id)
-      end
-    end
   end
 end