diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 16:29:42 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 16:29:42 +0000 |
| commit | 55aedc900fe5d80478f456bb822ea6fc8e6b58d7 (patch) | |
| tree | 74694d689e24f1ac727539e4a462c9b17314e663 /doc | |
| parent | 3a27ec45e1dd4062ffaf10c38b4405fb5ff9c128 (diff) | |
| parent | 4a9258371bf25ef0ce8687c3d7750d06b4337fe4 (diff) | |
| download | gitlab-ce-55aedc900fe5d80478f456bb822ea6fc8e6b58d7.tar.gz | |
Merge branch 'master' into 27783-fix-fe-doc-broken-link27783-fix-fe-doc-broken-link
* master:
Fix admin_labels_spec.rb transient failure
Make sure our current .gitlab-ci.yml is valid
Show Pipeline(not Job) in MR desktop notification
Remove a transient failure from spec/requests/api/groups_spec.rb
Update PROCESS.md
Update MergeRequest API state_event option documentation
Rename issuable to IssueBase
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, |