diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-27 17:50:30 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-27 17:50:30 +0100 |
| commit | 7499f65014257989510da50505fa7c0f5a4fae88 (patch) | |
| tree | b8c9355b73ec48c12bfa9d6416fa91ba4c4444e6 /lib/api/merge_requests.rb | |
| parent | 43d75960303be538fb79804ca6e2a90241aee0df (diff) | |
| download | gitlab-ce-7499f65014257989510da50505fa7c0f5a4fae88.tar.gz | |
API: extracted helper method to validate required parameters, code clean up
Added a helper method to check if required parameters are given in an API call. Can be used
to return a `400 Bad Request` return code if a required attribute is missing.
Code clean up and fixed tests.
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 76cf8154bf8..7e4ec7e803c 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -68,10 +68,7 @@ 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? + required_attributes! [:source_branch, :target_branch, :title] attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title] merge_request = user_project.merge_requests.new(attrs) @@ -125,7 +122,7 @@ 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? + required_attributes! [:note] merge_request = user_project.merge_requests.find(params[:merge_request_id]) note = merge_request.notes.new(note: params[:note], project_id: user_project.id) |