From 58438c60e5dc103cd63b54b7826de19d12558860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= Date: Fri, 10 Nov 2023 17:40:28 +0100 Subject: [PATCH] Add missing fields in ProjectApprovalsConfig (#994) --- .../api/models/ProjectApprovalsConfig.java | 34 +++++++++++++++++-- .../api/project-approvals-config.json | 4 ++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java b/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java index 5b169c86..5bf887f7 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java @@ -8,9 +8,11 @@ public class ProjectApprovalsConfig { private Integer approvalsBeforeMerge; private Boolean resetApprovalsOnPush; + private Boolean selectiveCodeOwnerRemovals; private Boolean disableOverridingApproversPerMergeRequest; private Boolean mergeRequestsAuthorApproval; private Boolean mergeRequestsDisableCommittersApproval; + private Boolean requirePasswordToApprove; public Integer getApprovalsBeforeMerge() { return approvalsBeforeMerge; @@ -38,6 +40,19 @@ public class ProjectApprovalsConfig { return (this); } + public Boolean getSelectiveCodeOwnerRemovals() { + return selectiveCodeOwnerRemovals; + } + + public void setSelectiveCodeOwnerRemovals(Boolean selectiveCodeOwnerRemovals) { + this.selectiveCodeOwnerRemovals = selectiveCodeOwnerRemovals; + } + + public ProjectApprovalsConfig withSelectiveCodeOwnerRemovals(Boolean selectiveCodeOwnerRemovals) { + this.selectiveCodeOwnerRemovals = selectiveCodeOwnerRemovals; + return this; + } + public Boolean getDisableOverridingApproversPerMergeRequest() { return disableOverridingApproversPerMergeRequest; } @@ -77,6 +92,19 @@ public class ProjectApprovalsConfig { return (this); } + public Boolean getRequirePasswordToApprove() { + return requirePasswordToApprove; + } + + public void setRequirePasswordToApprove(Boolean requirePasswordToApprove) { + this.requirePasswordToApprove = requirePasswordToApprove; + } + + public ProjectApprovalsConfig withRequirePasswordToApprove(Boolean requirePasswordToApprove) { + this.requirePasswordToApprove = requirePasswordToApprove; + return this; + } + /** * Get the form params specified by this instance. * @@ -84,11 +112,13 @@ public class ProjectApprovalsConfig { */ @JsonIgnore public GitLabApiForm getForm() { - return new GitLabApiForm() + return new GitLabApiForm() .withParam("approvals_before_merge", approvalsBeforeMerge) .withParam("reset_approvals_on_push", resetApprovalsOnPush) + .withParam("selective_code_owner_removals", selectiveCodeOwnerRemovals) .withParam("disable_overriding_approvers_per_merge_request", disableOverridingApproversPerMergeRequest) .withParam("merge_requests_author_approval", mergeRequestsAuthorApproval) - .withParam("merge_requests_disable_committers_approval", mergeRequestsDisableCommittersApproval); + .withParam("merge_requests_disable_committers_approval", mergeRequestsDisableCommittersApproval) + .withParam("require_password_to_approve", requirePasswordToApprove); } } diff --git a/src/test/resources/org/gitlab4j/api/project-approvals-config.json b/src/test/resources/org/gitlab4j/api/project-approvals-config.json index cec0d68c..05cb3575 100644 --- a/src/test/resources/org/gitlab4j/api/project-approvals-config.json +++ b/src/test/resources/org/gitlab4j/api/project-approvals-config.json @@ -1,7 +1,9 @@ { "approvals_before_merge": 2, "reset_approvals_on_push": true, + "selective_code_owner_removals": false, "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": false } \ No newline at end of file -- GitLab