From 016af097cb1fa872fdc28a786d16315e55cd2701 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 14 Dec 2019 15:07:56 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/requests/api/deployments_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/requests') diff --git a/spec/requests/api/deployments_spec.rb b/spec/requests/api/deployments_spec.rb index 6e78b747a8c..3dc8e5749d4 100644 --- a/spec/requests/api/deployments_spec.rb +++ b/spec/requests/api/deployments_spec.rb @@ -147,7 +147,7 @@ describe API::Deployments do expect(response).to have_gitlab_http_status(500) end - it 'links any merged merge requests to the deployment' do + it 'links any merged merge requests to the deployment', :sidekiq_inline do mr = create( :merge_request, :merged, @@ -199,7 +199,7 @@ describe API::Deployments do expect(json_response['ref']).to eq('master') end - it 'links any merged merge requests to the deployment' do + it 'links any merged merge requests to the deployment', :sidekiq_inline do mr = create( :merge_request, :merged, -- cgit v1.2.3