Commit aac8235d authored by Jeremie Bresson's avatar Jeremie Bresson
Browse files

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

parents 0a1a3cf5 bc350802
...@@ -190,7 +190,7 @@ public class ProtectedBranchesApi extends AbstractApi { ...@@ -190,7 +190,7 @@ public class ProtectedBranchesApi extends AbstractApi {
return (response.readEntity(ProtectedBranch.class)); return (response.readEntity(ProtectedBranch.class));
} }
/** /**
* Protects a single repository branch or several project repository branches using a wildcard protected branch. * Protects a single repository branch or several project repository branches using a wildcard protected branch.
* *
* <p>NOTE: This method is only available to GitLab Starter, Bronze, or higher.</p> * <p>NOTE: This method is only available to GitLab Starter, Bronze, or higher.</p>
...@@ -205,9 +205,9 @@ public class ProtectedBranchesApi extends AbstractApi { ...@@ -205,9 +205,9 @@ public class ProtectedBranchesApi extends AbstractApi {
* @param codeOwnerApprovalRequired prevent pushes to this branch if it matches an item in the CODEOWNERS file. (defaults: false) * @param codeOwnerApprovalRequired prevent pushes to this branch if it matches an item in the CODEOWNERS file. (defaults: false)
* @return the branch info for the protected branch * @return the branch info for the protected branch
* @throws GitLabApiException if any exception occurs * @throws GitLabApiException if any exception occurs
*/ */
public ProtectedBranch protectBranch(Object projectIdOrPath, String branchName, public ProtectedBranch protectBranch(Object projectIdOrPath, String branchName,
Integer allowedToPushUserId, Integer allowedToMergeUserId, Integer allowedToUnprotectUserId, Long allowedToPushUserId, Long allowedToMergeUserId, Long allowedToUnprotectUserId,
Boolean codeOwnerApprovalRequired) throws GitLabApiException { Boolean codeOwnerApprovalRequired) throws GitLabApiException {
return protectBranch(projectIdOrPath, branchName, allowedToPushUserId, allowedToMergeUserId, allowedToUnprotectUserId, codeOwnerApprovalRequired, null); return protectBranch(projectIdOrPath, branchName, allowedToPushUserId, allowedToMergeUserId, allowedToUnprotectUserId, codeOwnerApprovalRequired, null);
} }
...@@ -230,7 +230,7 @@ public class ProtectedBranchesApi extends AbstractApi { ...@@ -230,7 +230,7 @@ public class ProtectedBranchesApi extends AbstractApi {
* @throws GitLabApiException if any exception occurs * @throws GitLabApiException if any exception occurs
*/ */
public ProtectedBranch protectBranch(Object projectIdOrPath, String branchName, public ProtectedBranch protectBranch(Object projectIdOrPath, String branchName,
Integer allowedToPushUserId, Integer allowedToMergeUserId, Integer allowedToUnprotectUserId, Long allowedToPushUserId, Long allowedToMergeUserId, Long allowedToUnprotectUserId,
Boolean codeOwnerApprovalRequired, Boolean allowForcedPush) throws GitLabApiException { Boolean codeOwnerApprovalRequired, Boolean allowForcedPush) throws GitLabApiException {
Form formData = new GitLabApiForm() Form formData = new GitLabApiForm()
......
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