deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

API: merge request documentation updated, added return codes to functions

Browse source 
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.
This commit is contained in:
Sebastian Ziebell 2013-02-27 15:07:42 +01:00
parent e96d77d3db
commit 3b3add35fb
4 changed files with 59 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/api/merge_requests.rb
View file

@ -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