summaryrefslogtreecommitdiff
path: root/lib/api/issues.rb
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-11-01 15:20:54 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-11-01 15:20:54 +0000
commit3c99d8308a481b3f6edb002912ffc4d760b7fb64 (patch)
tree73555ed44c63103ae57836dd00587e45d084dff2 /lib/api/issues.rb
parent0336dc438b6faab575df996364076b57e388cc27 (diff)
parentd3a407d66fa553f3ff8afd1b9e42f01b9912e14a (diff)
downloadgitlab-ce-3c99d8308a481b3f6edb002912ffc4d760b7fb64.tar.gz
Merge branch 'master' into 'gl-ui-progress-bar'gl-ui-progress-bar
# Conflicts: # app/assets/javascripts/commons/gitlab_ui.js
Diffstat (limited to 'lib/api/issues.rb')
-rw-r--r--lib/api/issues.rb24
1 files changed, 24 insertions, 0 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index e37083165f5..7909f9c7a00 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -294,6 +294,30 @@ module API
end
# rubocop: enable CodeReuse/ActiveRecord
+ desc 'List merge requests that are related to the issue' do
+ success Entities::MergeRequestBasic
+ end
+ params do
+ requires :issue_iid, type: Integer, desc: 'The internal ID of a project issue'
+ end
+ 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)
+ .execute(issue)
+ .flatten
+ .map(&:iid)
+
+ merge_requests =
+ if merge_request_iids.present?
+ MergeRequestsFinder.new(current_user, project_id: user_project.id, iids: merge_request_iids).execute
+ else
+ MergeRequest.none
+ end
+
+ present paginate(merge_requests), with: Entities::MergeRequestBasic, current_user: current_user, project: user_project
+ end
+
desc 'List merge requests closing issue' do
success Entities::MergeRequestBasic
end