diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-08-06 20:18:16 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-08-06 20:18:16 +0000 |
| commit | 921611d19dff9aed8d4c35edd0578614630a01c8 (patch) | |
| tree | 1d0c478a4537280556532fa2b95fc3a05292f259 | |
| parent | 30ec7afadf2e5bfe5ec94a767fcf724204ecd0b5 (diff) | |
| parent | f2dc791337e94fd0855162abeeabe65c1c467617 (diff) | |
| download | gitlab-ce-921611d19dff9aed8d4c35edd0578614630a01c8.tar.gz | |
Merge branch 'jramsay/committer-approval-api' into 'master'
Add committer approval API attribute docs
Closes #61796
See merge request gitlab-org/gitlab-ce!31538
| -rw-r--r-- | doc/api/merge_request_approvals.md | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/doc/api/merge_request_approvals.md b/doc/api/merge_request_approvals.md index c211916464a..cc95689a65f 100644 --- a/doc/api/merge_request_approvals.md +++ b/doc/api/merge_request_approvals.md @@ -72,13 +72,14 @@ POST /projects/:id/approvals **Parameters:** -| Attribute | Type | Required | Description | -| ------------------------------------------------ | ------- | -------- | ---------------------------------------------------------- | -| `id` | integer | yes | The ID of a project | -| `approvals_before_merge` | integer | no | How many approvals are required before an MR can be merged | -| `reset_approvals_on_push` | boolean | no | Reset approvals on a new push | -| `disable_overriding_approvers_per_merge_request` | boolean | no | Allow/Disallow overriding approvers per MR | -| `merge_requests_author_approval` | boolean | no | Allow/Disallow authors be able to self approve merge requests | +| Attribute | Type | Required | Description | +| ------------------------------------------------ | ------- | -------- | --------------------------------------------------------------------------------------------------- | +| `id` | integer | yes | The ID of a project | +| `approvals_before_merge` | integer | no | How many approvals are required before an MR can be merged | +| `reset_approvals_on_push` | boolean | no | Reset approvals on a new push | +| `disable_overriding_approvers_per_merge_request` | boolean | no | Allow/Disallow overriding approvers per MR | +| `merge_requests_author_approval` | boolean | no | Allow/Disallow authors from self approving merge requests; `true` means authors cannot self approve | +| `merge_requests_disable_committers_approval` | boolean | no | Allow/Disallow committers from self approving merge requests | ```json { @@ -115,7 +116,8 @@ POST /projects/:id/approvals "approvals_before_merge": 2, "reset_approvals_on_push": true, "disable_overriding_approvers_per_merge_request": false, - "merge_requests_author_approval": false + "merge_requests_author_approval": false, + "merge_requests_disable_committers_approval": false } ``` |