Skip to content

Commit efecc6a

Browse files
jminiaszarama
authored andcommitted
Add missing fields in ProjectApprovalsConfig (gitlab4j#994)
(cherry picked from commit 58438c6)
1 parent e60574b commit efecc6a

File tree

2 files changed

+35
-3
lines changed

2 files changed

+35
-3
lines changed

src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ public class ProjectApprovalsConfig {
88

99
private Integer approvalsBeforeMerge;
1010
private Boolean resetApprovalsOnPush;
11+
private Boolean selectiveCodeOwnerRemovals;
1112
private Boolean disableOverridingApproversPerMergeRequest;
1213
private Boolean mergeRequestsAuthorApproval;
1314
private Boolean mergeRequestsDisableCommittersApproval;
15+
private Boolean requirePasswordToApprove;
1416

1517
public Integer getApprovalsBeforeMerge() {
1618
return approvalsBeforeMerge;
@@ -38,6 +40,19 @@ public ProjectApprovalsConfig withResetApprovalsOnPush(Boolean resetApprovalsOnP
3840
return (this);
3941
}
4042

43+
public Boolean getSelectiveCodeOwnerRemovals() {
44+
return selectiveCodeOwnerRemovals;
45+
}
46+
47+
public void setSelectiveCodeOwnerRemovals(Boolean selectiveCodeOwnerRemovals) {
48+
this.selectiveCodeOwnerRemovals = selectiveCodeOwnerRemovals;
49+
}
50+
51+
public ProjectApprovalsConfig withSelectiveCodeOwnerRemovals(Boolean selectiveCodeOwnerRemovals) {
52+
this.selectiveCodeOwnerRemovals = selectiveCodeOwnerRemovals;
53+
return this;
54+
}
55+
4156
public Boolean getDisableOverridingApproversPerMergeRequest() {
4257
return disableOverridingApproversPerMergeRequest;
4358
}
@@ -77,18 +92,33 @@ public ProjectApprovalsConfig withMergeRequestsDisableCommittersApproval(Boolean
7792
return (this);
7893
}
7994

95+
public Boolean getRequirePasswordToApprove() {
96+
return requirePasswordToApprove;
97+
}
98+
99+
public void setRequirePasswordToApprove(Boolean requirePasswordToApprove) {
100+
this.requirePasswordToApprove = requirePasswordToApprove;
101+
}
102+
103+
public ProjectApprovalsConfig withRequirePasswordToApprove(Boolean requirePasswordToApprove) {
104+
this.requirePasswordToApprove = requirePasswordToApprove;
105+
return this;
106+
}
107+
80108
/**
81109
* Get the form params specified by this instance.
82110
*
83111
* @return a GitLabApiForm instance holding the form parameters for this ProjectApprovalsConfig instance
84112
*/
85113
@JsonIgnore
86114
public GitLabApiForm getForm() {
87-
return new GitLabApiForm()
115+
return new GitLabApiForm()
88116
.withParam("approvals_before_merge", approvalsBeforeMerge)
89117
.withParam("reset_approvals_on_push", resetApprovalsOnPush)
118+
.withParam("selective_code_owner_removals", selectiveCodeOwnerRemovals)
90119
.withParam("disable_overriding_approvers_per_merge_request", disableOverridingApproversPerMergeRequest)
91120
.withParam("merge_requests_author_approval", mergeRequestsAuthorApproval)
92-
.withParam("merge_requests_disable_committers_approval", mergeRequestsDisableCommittersApproval);
121+
.withParam("merge_requests_disable_committers_approval", mergeRequestsDisableCommittersApproval)
122+
.withParam("require_password_to_approve", requirePasswordToApprove);
93123
}
94124
}
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"approvals_before_merge": 2,
33
"reset_approvals_on_push": true,
4+
"selective_code_owner_removals": false,
45
"disable_overriding_approvers_per_merge_request": false,
56
"merge_requests_author_approval": false,
6-
"merge_requests_disable_committers_approval": false
7+
"merge_requests_disable_committers_approval": false,
8+
"require_password_to_approve": false
79
}

0 commit comments

Comments
 (0)