Merge remote-tracking branch 'origin/main' into 6.x

gitlab4j · Nov 10, 2023 · 426f18b · 426f18b
2 parents 94a9a8f + 58438c6
commit 426f18b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git 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 ProjectApprovalsConfig withResetApprovalsOnPush(Boolean resetApprovalsOnP
         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,18 +92,33 @@ public ProjectApprovalsConfig withMergeRequestsDisableCommittersApproval(Boolean
         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.
      *
      * @return a GitLabApiForm instance holding the form parameters for this ProjectApprovalsConfig instance
      */
     @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
@@ -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
 }