diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-12 11:39:18 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-12 11:39:18 +0300 |
| commit | 0807bd51308c9f56b914a0a6a3655806d92835a9 (patch) | |
| tree | fab7e53bc76211d071a7c20fc6cc02fc900cc1c6 /lib | |
| parent | dd4171eb63e947bb5bdd57aa57242557aac1e963 (diff) | |
| parent | 2d59a0ff448cbb970db5754787753db810a9acc4 (diff) | |
Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into 'master'
API: Allow to set or update a merge-request's milestone
_Originally opened at !2107 by @ skakirill._
- - -
See merge request !2755
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 4230c68abb2..c5e5d57ed4d 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 |