summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorSebastian Ziebell <sebastian.ziebell@asquera.de>2013-02-27 15:07:42 +0100
committerSebastian Ziebell <sebastian.ziebell@asquera.de>2013-02-27 15:07:42 +0100
commit3b3add35fb88578df96fe9b728ddac896ea9c944 (patch)
tree275e21efdc5ea940e5c149f74064d43ffe1d0354 /lib/api
parente96d77d3dbd789981b8e85e7afba9a5908d79483 (diff)
downloadgitlab-ce-3b3add35fb88578df96fe9b728ddac896ea9c944.tar.gz
API: merge request documentation updated, added return codes to functions
The API documentation of merge requests contains info to status codes for all functions. Required arguments are now checked in the merge requests API functions and a `400 Bad Request` error is returned if they are not given.
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/merge_requests.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 4b28094f1a4..76cf8154bf8 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -69,6 +69,10 @@ module Gitlab
post ":id/merge_requests" do
authorize! :write_merge_request, user_project
+ bad_request!(:source_branch) unless params[:source_branch].present?
+ bad_request!(:target_branch) unless params[:target_branch].present?
+ bad_request!(:title) unless params[:title].present?
+
attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title]
merge_request = user_project.merge_requests.new(attrs)
merge_request.author = current_user
@@ -121,6 +125,8 @@ module Gitlab
# POST /projects/:id/merge_request/:merge_request_id/comments
#
post ":id/merge_request/:merge_request_id/comments" do
+ bad_request!(:note) unless params[:note].present?
+
merge_request = user_project.merge_requests.find(params[:merge_request_id])
note = merge_request.notes.new(note: params[:note], project_id: user_project.id)
note.author = current_user
@@ -128,9 +134,6 @@ module Gitlab
if note.save
present note, with: Entities::MRNote
else
- if note.errors[:note].any?
- bad_request!(:note)
- end
not_found!
end
end