summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValeriy Sizov <vsv2711@gmail.com>2012-10-21 14:41:06 +0300
committerValeriy Sizov <vsv2711@gmail.com>2012-10-22 23:09:21 +0300
commitfe59547ae5b272a183253c31e5273d52d0a02381 (patch)
treec036ba2e294063f11ac0903f93e5d003ef676cc2
parentbd049e5e7c80259689eb4494a3e7eea4bd5a66b0 (diff)
downloadgitlab-ce-fe59547ae5b272a183253c31e5273d52d0a02381.tar.gz
API: create merge request
-rw-r--r--lib/api/merge_requests.rb12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 12c9647be3d..fd741585158 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -18,7 +18,17 @@ module Gitlab
#create merge_request
post ":id/merge_requests" do
-
+ attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title]
+ project = current_user.projects.find(params[:id])
+ merge_request = project.merge_requests.new(attrs)
+ merge_request.author = current_user
+
+ if merge_request.save
+ merge_request.reload_code
+ present merge_request, with: Entities::MergeRequest
+ else
+ not_found!
+ end
end
#update merge_request