summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Ramsay <james@jramsay.com.au>2019-08-06 10:55:56 -0400
committerJames Ramsay <james@jramsay.com.au>2019-08-06 13:49:58 -0400
commitf2dc791337e94fd0855162abeeabe65c1c467617 (patch)
tree7cb7274569278262213c47d09c8b7d93c5c40c72
parent4aa824e7059889c7b8badb4bd43cc44f9a01201f (diff)
downloadgitlab-ce-jramsay/committer-approval-api.tar.gz
Add committer approval API attributejramsay/committer-approval-api
Merge Requests Approvals can be restricted to prevent the merge request author or merge request committers from self approving. The author restriction is already available in the API, but the committer restriction was not.
-rw-r--r--doc/api/merge_request_approvals.md18
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
}
```