Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
58438c60
Unverified
Commit
58438c60
authored
Nov 10, 2023
by
Jérémie Bresson
Committed by
GitHub
Nov 10, 2023
Browse files
Add missing fields in ProjectApprovalsConfig (#994)
parent
dc2ab0b5
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java
View file @
58438c60
...
@@ -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
);
}
}
}
}
src/test/resources/org/gitlab4j/api/project-approvals-config.json
View file @
58438c60
{
{
"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
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment