diff options
author | Rémy Coutable <remy@rymai.me> | 2017-04-04 16:45:31 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-04-04 16:45:31 +0000 |
commit | 93de37ce1bd0f5ce015287f0729d625ddf6f7390 (patch) | |
tree | f5002aaa70141bb3e84c344f599e50031a19aa1d /spec | |
parent | 93e36d56e0d494b5c334603f0072f4a085edaa33 (diff) | |
parent | d663b8de246a4307a283b464ab4b5344463d30c3 (diff) | |
download | gitlab-ce-93de37ce1bd0f5ce015287f0729d625ddf6f7390.tar.gz |
Merge branch 'bug/api_milestone_merge_requests_scope' into 'master'
Fixes milestone/merge_request API endpoint to really scope the results
See merge request !10369
Diffstat (limited to 'spec')
-rw-r--r-- | spec/requests/api/milestones_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/requests/api/milestones_spec.rb b/spec/requests/api/milestones_spec.rb index 7fb728fed6f..598968aff70 100644 --- a/spec/requests/api/milestones_spec.rb +++ b/spec/requests/api/milestones_spec.rb @@ -306,6 +306,8 @@ describe API::Milestones, api: true do end it 'returns project merge_requests for a particular milestone' do + # eager-load another_merge_request + another_merge_request get api("/projects/#{project.id}/milestones/#{milestone.id}/merge_requests", user) expect(response).to have_http_status(200) |