diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-28 18:09:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-28 18:09:35 +0000 |
| commit | 95e18e32833de71b46d73ead66c8f13e261af3f4 (patch) | |
| tree | bf61062dc1ae8ec2a25b28cd6385190661d3b37c /spec/requests/api/deployments_spec.rb | |
| parent | 37ae6b54ba524c438d1b756ce3ca29bbcec4e897 (diff) | |
| download | gitlab-ce-95e18e32833de71b46d73ead66c8f13e261af3f4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api/deployments_spec.rb')
| -rw-r--r-- | spec/requests/api/deployments_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/deployments_spec.rb b/spec/requests/api/deployments_spec.rb index b820b227fff..ef2415a0cde 100644 --- a/spec/requests/api/deployments_spec.rb +++ b/spec/requests/api/deployments_spec.rb @@ -439,7 +439,7 @@ describe API::Deployments do let!(:merge_request3) { create(:merge_request, source_project: project2, target_project: project2) } it 'returns the relevant merge requests linked to a deployment for a project' do - deployment.merge_requests << [merge_request1, merge_request2] + deployment.link_merge_requests(MergeRequest.where(id: [merge_request1.id, merge_request2.id])) subject |