Directly use MRs given by ReferencedMergeRequestsService

This commit is contained in:
Robert Schilling 2019-02-14 23:11:06 +01:00
parent feb2cb9085
commit 6e4fdc117c
2 changed files with 6 additions and 11 deletions

View File

@ -304,19 +304,14 @@ module API
get ':id/issues/:issue_iid/related_merge_requests' do
issue = find_project_issue(params[:issue_iid])
merge_request_iids = ::Issues::ReferencedMergeRequestsService.new(user_project, current_user)
merge_requests = ::Issues::ReferencedMergeRequestsService.new(user_project, current_user)
.execute(issue)
.flatten
.map(&:iid)
merge_requests =
if merge_request_iids.present?
MergeRequest.all.where(iid: merge_request_iids)
else
MergeRequest.none
end
present paginate(merge_requests), with: Entities::MergeRequestBasic, current_user: current_user, project: user_project
present paginate(::Kaminari.paginate_array(merge_requests)),
with: Entities::MergeRequestBasic,
current_user: current_user,
project: user_project
end
desc 'List merge requests closing issue' do

View File

@ -1835,7 +1835,7 @@ describe API::Issues do
get_related_merge_requests(project.id, issue.iid, user)
expect_paginated_array_response(merge_request.id)
expect_paginated_array_response([related_mr.id, merge_request.id])
end
context 'no merge request mentioned a issue' do