Unverified Commit 58438c60 authored by Jérémie Bresson's avatar Jérémie Bresson Committed by GitHub
Browse files

Add missing fields in ProjectApprovalsConfig (#994)

parent dc2ab0b5
...@@ -8,9 +8,11 @@ public class ProjectApprovalsConfig { ...@@ -8,9 +8,11 @@ public class ProjectApprovalsConfig {
private Integer approvalsBeforeMerge; private Integer approvalsBeforeMerge;
private Boolean resetApprovalsOnPush; private Boolean resetApprovalsOnPush;
private Boolean selectiveCodeOwnerRemovals;
private Boolean disableOverridingApproversPerMergeRequest; private Boolean disableOverridingApproversPerMergeRequest;
private Boolean mergeRequestsAuthorApproval; private Boolean mergeRequestsAuthorApproval;
private Boolean mergeRequestsDisableCommittersApproval; private Boolean mergeRequestsDisableCommittersApproval;
private Boolean requirePasswordToApprove;
public Integer getApprovalsBeforeMerge() { public Integer getApprovalsBeforeMerge() {
return approvalsBeforeMerge; return approvalsBeforeMerge;
...@@ -38,6 +40,19 @@ public class ProjectApprovalsConfig { ...@@ -38,6 +40,19 @@ public class ProjectApprovalsConfig {
return (this); 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() { public Boolean getDisableOverridingApproversPerMergeRequest() {
return disableOverridingApproversPerMergeRequest; return disableOverridingApproversPerMergeRequest;
} }
...@@ -77,6 +92,19 @@ public class ProjectApprovalsConfig { ...@@ -77,6 +92,19 @@ public class ProjectApprovalsConfig {
return (this); 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. * Get the form params specified by this instance.
* *
...@@ -84,11 +112,13 @@ public class ProjectApprovalsConfig { ...@@ -84,11 +112,13 @@ public class ProjectApprovalsConfig {
*/ */
@JsonIgnore @JsonIgnore
public GitLabApiForm getForm() { public GitLabApiForm getForm() {
return new GitLabApiForm() return new GitLabApiForm()
.withParam("approvals_before_merge", approvalsBeforeMerge) .withParam("approvals_before_merge", approvalsBeforeMerge)
.withParam("reset_approvals_on_push", resetApprovalsOnPush) .withParam("reset_approvals_on_push", resetApprovalsOnPush)
.withParam("selective_code_owner_removals", selectiveCodeOwnerRemovals)
.withParam("disable_overriding_approvers_per_merge_request", disableOverridingApproversPerMergeRequest) .withParam("disable_overriding_approvers_per_merge_request", disableOverridingApproversPerMergeRequest)
.withParam("merge_requests_author_approval", mergeRequestsAuthorApproval) .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);
} }
} }
{ {
"approvals_before_merge": 2, "approvals_before_merge": 2,
"reset_approvals_on_push": true, "reset_approvals_on_push": true,
"selective_code_owner_removals": false,
"disable_overriding_approvers_per_merge_request": false, "disable_overriding_approvers_per_merge_request": false,
"merge_requests_author_approval": 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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment