API: update merge request call

Valeriy Sizov
1 parent fe59547a
Showing 1 changed file with 11 additions and 1 deletions Show diff stats
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
	@@ -33,7 +33,17 @@ module Gitlab		@@ -33,7 +33,17 @@ module Gitlab
33		33
34	#update merge_request	34	#update merge_request
35	put ":id/merge_request/:merge_request_id" do	35	put ":id/merge_request/:merge_request_id" do
36	-	36	+ attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :closed]
		37	+ project = current_user.projects.find(params[:id])
		38	+ merge_request = project.merge_requests.find(params[:merge_request_id])
		39	+
		40	+ if merge_request.update_attributes attrs
		41	+ merge_request.reload_code
		42	+ merge_request.mark_as_unchecked
		43	+ present merge_request, with: Entities::MergeRequest
		44	+ else
		45	+ not_found!
		46	+ end
37	end	47	end
38		48
39	end	49	end