summaryrefslogtreecommitdiff
path: root/lib/api/v3/merge_requests.rb
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2017-03-06 12:48:10 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2017-03-06 14:17:07 +0100
commitc727d4328fa14c4e90eb47c04f045c0f54224018 (patch)
treeb44e0a483f82b0902a3cdc52b17fb8be1269db26 /lib/api/v3/merge_requests.rb
parent5753acfabc20b97f3ff8f9767382b960a4a9e95a (diff)
downloadgitlab-ce-c727d4328fa14c4e90eb47c04f045c0f54224018.tar.gz
Remove "subscribed" field from API responses returning list of issues or merge requestsapi-drop-subscribed
Diffstat (limited to 'lib/api/v3/merge_requests.rb')
-rw-r--r--lib/api/v3/merge_requests.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/api/v3/merge_requests.rb b/lib/api/v3/merge_requests.rb
index 654e818e1b5..7dbd4691a94 100644
--- a/lib/api/v3/merge_requests.rb
+++ b/lib/api/v3/merge_requests.rb
@@ -28,6 +28,14 @@ module API
render_api_error!(errors, 400)
end
+ def issue_entity(project)
+ if project.has_external_issue_tracker?
+ ::API::Entities::ExternalIssue
+ else
+ ::API::Entities::Issue
+ end
+ end
+
params :optional_params do
optional :description, type: String, desc: 'The description of the merge request'
optional :assignee_id, type: Integer, desc: 'The ID of a user to assign the merge request'