diff options
| author | Greg Messner <greg@messners.com> | 2014-03-03 23:08:39 -0800 |
|---|---|---|
| committer | Greg Messner <greg@messners.com> | 2014-03-03 23:08:39 -0800 |
| commit | 7e14f86c71b8b2f94ad65cae6118f752c8f31610 (patch) | |
| tree | 7c87770ab3692d55e62d079987b98a0fd2f0e7c1 | |
| parent | d0e73eeca1f4e9d460a50200518e49b3afebbac9 (diff) | |
| download | gitlab-ce-7e14f86c71b8b2f94ad65cae6118f752c8f31610.tar.gz | |
Added description parameter support to Create and Update MR API endpoints (issue-110).
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/api/merge_requests.rb | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index ab420399263..315513030f7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ v 6.7.0 - Show contribution guide link for new issue form (Jeroen van Baarsen) - Fix CI status for merge requests from fork - Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard) + - Create and Update MR calls now support the description parameter (Greg Messner) v 6.6.2 - Fix 500 error on branch/tag create or remove via UI diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 58d2f79faff..e2458198411 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -64,6 +64,7 @@ module API # target_project - The target project of the merge request defaults to the :id of the project # assignee_id - Assignee user ID # title (required) - Title of MR + # description - Description of MR # # Example: # POST /projects/:id/merge_requests @@ -72,7 +73,7 @@ module API set_current_user_for_thread do authorize! :write_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] + attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :target_project_id, :description] merge_request = user_project.merge_requests.new(attrs) merge_request.author = current_user merge_request.source_project = user_project @@ -105,12 +106,13 @@ module API # assignee_id - Assignee user ID # title - Title of MR # state_event - Status of MR. (close|reopen|merge) + # description - Description of MR # Example: # PUT /projects/:id/merge_request/:merge_request_id # put ":id/merge_request/:merge_request_id" do set_current_user_for_thread do - attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :state_event] + attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :state_event, :description] merge_request = user_project.merge_requests.find(params[:merge_request_id]) authorize! :modify_merge_request, merge_request |