summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValeriy Sizov <vsv2711@gmail.com>2012-10-21 14:59:50 +0300
committerValeriy Sizov <vsv2711@gmail.com>2012-10-22 23:09:21 +0300
commit5a89934af8bd09d40c01c940b2305f95374be1bd (patch)
tree42cc419acc58caf0abfea7d0785803c823f4572d
parentfe59547ae5b272a183253c31e5273d52d0a02381 (diff)
downloadgitlab-ce-5a89934af8bd09d40c01c940b2305f95374be1bd.tar.gz
API: update merge request call
-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 fd741585158..92ff4937577 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -33,7 +33,17 @@ module Gitlab
#update merge_request
put ":id/merge_request/:merge_request_id" do
-
+ attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :closed]
+ project = current_user.projects.find(params[:id])
+ merge_request = project.merge_requests.find(params[:merge_request_id])
+
+ if merge_request.update_attributes attrs
+ merge_request.reload_code
+ merge_request.mark_as_unchecked
+ present merge_request, with: Entities::MergeRequest
+ else
+ not_found!
+ end
end
end