diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-06 18:10:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-06 18:10:04 +0300 |
commit | f3b1e07903a7f509b11ad7cf188fac46d98f77f6 (patch) | |
tree | a6fa5e65d83d94334387952f1f526ed438604408 /doc/api/merge_request_approvals.md | |
parent | ba174c982f40d71a87fd511b091753807174f7e7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/merge_request_approvals.md')
-rw-r--r-- | doc/api/merge_request_approvals.md | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/doc/api/merge_request_approvals.md b/doc/api/merge_request_approvals.md index 8fee23a74e8..84f5e41496c 100644 --- a/doc/api/merge_request_approvals.md +++ b/doc/api/merge_request_approvals.md @@ -676,7 +676,8 @@ This includes additional information about the users who have already approved } ], "source_rule": null, - "approved": true + "approved": true, + "overridden": false } ] } @@ -753,7 +754,8 @@ GET /projects/:id/merge_requests/:merge_request_iid/approval_rules "ldap_access": null } ], - "contains_hidden_groups": false + "contains_hidden_groups": false, + "overridden": false } ] ``` @@ -837,7 +839,8 @@ will be used. "ldap_access": null } ], - "contains_hidden_groups": false + "contains_hidden_groups": false, + "overridden": false } ``` @@ -921,7 +924,8 @@ These are system generated rules. "ldap_access": null } ], - "contains_hidden_groups": false + "contains_hidden_groups": false, + "overridden": false } ``` |