diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-14 18:07:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-14 18:07:56 +0300 |
| commit | 016af097cb1fa872fdc28a786d16315e55cd2701 (patch) | |
| tree | 76f97f90a8048685efb3eb0c543b3a75d99be6ee /spec/requests | |
| parent | 00b8ecb72c9f77d864aff3572f028613f45af03c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/deployments_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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, |