Download as
Browse Code »

Commit 7e14f86c71b8b2f94ad65cae6118f752c8f31610

Authored by Greg Messner
1 parent d0e73eec
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Added description parameter support to Create and Update MR API endpoints (issue-110).

Showing 2 changed files with 5 additions and 2 deletions   Show diff stats
CHANGELOG
  Diff comments   View file @7e14f86
... ... @@ -8,6 +8,7 @@ v 6.7.0
8 8 - Show contribution guide link for new issue form (Jeroen van Baarsen)
9 9 - Fix CI status for merge requests from fork
10 10 - Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard)
  11 + - Create and Update MR calls now support the description parameter (Greg Messner)
11 12  
12 13 v 6.6.2
13 14 - Fix 500 error on branch/tag create or remove via UI
... ...
lib/api/merge_requests.rb
  Diff comments   View file @7e14f86
... ... @@ -64,6 +64,7 @@ module API
64 64 # target_project - The target project of the merge request defaults to the :id of the project
65 65 # assignee_id - Assignee user ID
66 66 # title (required) - Title of MR
  67 + # description - Description of MR
67 68 #
68 69 # Example:
69 70 # POST /projects/:id/merge_requests
... ... @@ -72,7 +73,7 @@ module API
72 73 set_current_user_for_thread do
73 74 authorize! :write_merge_request, user_project
74 75 required_attributes! [:source_branch, :target_branch, :title]
75   - attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :target_project_id]
  76 + attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :target_project_id, :description]
76 77 merge_request = user_project.merge_requests.new(attrs)
77 78 merge_request.author = current_user
78 79 merge_request.source_project = user_project
... ... @@ -105,12 +106,13 @@ module API
105 106 # assignee_id - Assignee user ID
106 107 # title - Title of MR
107 108 # state_event - Status of MR. (close|reopen|merge)
  109 + # description - Description of MR
108 110 # Example:
109 111 # PUT /projects/:id/merge_request/:merge_request_id
110 112 #
111 113 put ":id/merge_request/:merge_request_id" do
112 114 set_current_user_for_thread do
113   - attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :state_event]
  115 + attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :state_event, :description]
114 116 merge_request = user_project.merge_requests.find(params[:merge_request_id])
115 117  
116 118 authorize! :modify_merge_request, merge_request
... ...