diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 15:57:18 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 15:57:18 +0000 |
| commit | 689f7933ec48cb8855f47fdc00dc5c5c41d689a8 (patch) | |
| tree | 305ccb528926ebf07f6bb5443c9aed5c182d66b1 /doc | |
| parent | 657c4c18be9391d2e021f47294ce929812c9277f (diff) | |
| parent | b88e82ff0a1bca9687b5579208ba05a99e41a464 (diff) | |
| download | gitlab-ce-689f7933ec48cb8855f47fdc00dc5c5c41d689a8.tar.gz | |
Merge branch 'master' into 27955-mr-notification-use-pipeline-language
* master:
Remove a transient failure from spec/requests/api/groups_spec.rb
Update PROCESS.md
Update MergeRequest API state_event option documentation
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/merge_requests.md | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 1cf7632d60c..6ee377125d6 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -350,16 +350,17 @@ PUT /projects/:id/merge_requests/:merge_request_id | --------- | ---- | -------- | ----------- | | `id` | string | yes | The ID of a project | | `merge_request_id` | integer | yes | The ID of a merge request | -| `source_branch` | string | yes | The source branch | -| `target_branch` | string | yes | The target branch | -| `title` | string | yes | Title of MR | +| `target_branch` | string | no | The target branch | +| `title` | string | no | Title of MR | | `assignee_id` | integer | no | Assignee user ID | | `description` | string | no | Description of MR | -| `target_project_id` | integer | no | The target project (numeric id) | +| `state_event` | string | no | New state (close/reopen) | | `labels` | string | no | Labels for MR as a comma-separated list | | `milestone_id` | integer | no | The ID of a milestone | | `remove_source_branch` | boolean | no | Flag indicating if a merge request should remove the source branch when merging | +Must include at least one non-required attribute from above. + ```json { "id": 1, |