Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2019-02-15 01:11:06 +0300
committerRobert Schilling <rschilling@student.tugraz.at>2019-02-15 01:11:06 +0300
commit6e4fdc117c6a78c0de0e65a31e4867b6ece063df (patch)
tree87197aa53a6b1c2eba781568f62d51bd340136c9 /lib/api/issues.rb
parentfeb2cb9085ace1c0b9dbc86df59de0d5d6521a4d (diff)
Directly use MRs given by ReferencedMergeRequestsService
Diffstat (limited to 'lib/api/issues.rb')
-rw-r--r--lib/api/issues.rb15
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index f44df1d4fcd..a85a0909e86 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -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