diff options
author | Kirill Skachkov <kskachkov@tradingview.com> | 2015-12-15 16:40:03 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-02-08 15:49:35 +0100 |
commit | 81f2a9e5b038ed76404cba4d00870bf227a168a7 (patch) | |
tree | 9d84d9c7764ea7b7cece8539a584325e5c322de2 /lib | |
parent | 9fdd605fd2e4550170e5ef088bec7c6d2585c4a5 (diff) | |
download | gitlab-ce-81f2a9e5b038ed76404cba4d00870bf227a168a7.tar.gz |
API: Allow to set or update a merge-request's milestone
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/merge_requests.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index dd7f24f3279..c54beb00ac5 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -71,6 +71,7 @@ module API # title (required) - Title of MR # description - Description of MR # labels (optional) - Labels for MR as a comma-separated list + # milestone_id (optional) - Milestone ID # # Example: # POST /projects/:id/merge_requests @@ -78,7 +79,7 @@ module API post ":id/merge_requests" do authorize! :create_merge_request, user_project required_attributes! [:source_branch, :target_branch, :title] - attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :target_project_id, :description] + attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :target_project_id, :description, :milestone_id] # Validate label names in advance if (errors = validate_label_params(params)).any? @@ -163,11 +164,12 @@ module API # state_event - Status of MR. (close|reopen|merge) # description - Description of MR # labels (optional) - Labels for a MR as a comma-separated list + # milestone_id (optional) - Milestone ID # Example: # PUT /projects/:id/merge_requests/:merge_request_id # put path do - attrs = attributes_for_keys [:target_branch, :assignee_id, :title, :state_event, :description] + attrs = attributes_for_keys [:target_branch, :assignee_id, :title, :state_event, :description, :milestone_id] merge_request = user_project.merge_requests.find(params[:merge_request_id]) authorize! :update_merge_request, merge_request |