diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-10-13 20:17:23 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-10-13 20:17:23 +0300 |
| commit | ea2008df939d40ecba4fff84aa66c5656c550091 (patch) | |
| tree | 1365614bbc55f3ff367cc6be8c21c306251511e5 | |
| parent | e0072892e888f36dcec928ba65cea307da2fbaf2 (diff) | |
| parent | 2297a7ba1f5d004c877a7cb82510d7d635f90ec0 (diff) | |
Merge pull request #9723 from sue445/tweak_api_doc
Tweak api doc
| -rw-r--r-- | doc/api/merge_requests.md | 2 | ||||
| -rw-r--r-- | lib/api/merge_requests.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index bb551fc67f7..ffa7f2cdf14 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -188,6 +188,7 @@ Parameters: - `title` (required) - Title of MR - `description` (optional) - Description of MR - `target_project_id` (optional) - The target project (numeric id) +- `labels` (optional) - Labels for MR as a comma-separated list ```json { @@ -239,6 +240,7 @@ Parameters: - `title` - Title of MR - `description` - Description of MR - `state_event` - New state (close|reopen|merge) +- `labels` (optional) - Labels for MR as a comma-separated list ```json { diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 63ea2f05438..f3a59fadf24 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -99,7 +99,7 @@ module API # id (required) - The ID of a project - this will be the source of the merge request # source_branch (required) - The source branch # target_branch (required) - The target branch - # target_project - The target project of the merge request defaults to the :id of the project + # target_project_id - 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 |