diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-31 12:08:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-31 12:08:33 +0000 |
commit | 1808454313ed75c92e1384466e8c83bfbc8ae25e (patch) | |
tree | 5c006c158fd796dc6d21e9bd771542f2fb0c24e2 /doc/api | |
parent | fd3a95f07ae9cd78fecffcfa5de4494f933a7808 (diff) | |
download | gitlab-ce-1808454313ed75c92e1384466e8c83bfbc8ae25e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
-rw-r--r-- | doc/api/merge_request_approvals.md | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/doc/api/merge_request_approvals.md b/doc/api/merge_request_approvals.md index 37cd4da9e2c..a96b9aadc41 100644 --- a/doc/api/merge_request_approvals.md +++ b/doc/api/merge_request_approvals.md @@ -25,7 +25,10 @@ GET /projects/:id/approvals { "approvals_before_merge": 2, "reset_approvals_on_push": true, - "disable_overriding_approvers_per_merge_request": false + "disable_overriding_approvers_per_merge_request": false, + "merge_requests_author_approval": true, + "merge_requests_disable_committers_approval": false, + "require_password_to_approve": true } ``` @@ -50,6 +53,7 @@ POST /projects/:id/approvals | `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 | +| `require_password_to_approve` | boolean | no | Require approver to enter a password in order to authenticate before adding the approval | ```json { @@ -57,7 +61,8 @@ POST /projects/:id/approvals "reset_approvals_on_push": true, "disable_overriding_approvers_per_merge_request": false, "merge_requests_author_approval": false, - "merge_requests_disable_committers_approval": false + "merge_requests_disable_committers_approval": false, + "require_password_to_approve": true } ``` @@ -441,7 +446,10 @@ PUT /projects/:id/approvers ], "approvals_before_merge": 2, "reset_approvals_on_push": true, - "disable_overriding_approvers_per_merge_request": false + "disable_overriding_approvers_per_merge_request": false, + "merge_requests_author_approval": true, + "merge_requests_disable_committers_approval": false, + "require_password_to_approve": true } ``` |