From 5a89934af8bd09d40c01c940b2305f95374be1bd Mon Sep 17 00:00:00 2001 From: Valeriy Sizov Date: Sun, 21 Oct 2012 14:59:50 +0300 Subject: [PATCH] API: update merge request call --- lib/api/merge_requests.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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