Skip to content

Commit f4baefa

Browse files
authored
Merge branch 'gitlab4j:main' into main
2 parents 406818f + 973e294 commit f4baefa

File tree

4 files changed

+24
-7
lines changed

4 files changed

+24
-7
lines changed

gitlab4j-api/src/main/java/org/gitlab4j/api/ProjectApi.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,6 +1072,7 @@ public Project createProject(Project project) throws GitLabApiException {
10721072
* buildGitStrategy (optional) - set the build git strategy
10731073
* buildCoverageRegex (optional) - set build coverage regex
10741074
* ciConfigPath (optional) - Set path to CI configuration file
1075+
* autoDevopsEnabled (optional) - Enable Auto DevOps for this project
10751076
* squashOption (optional) - set squash option for merge requests
10761077
*
10771078
* @param project the Project instance with the configuration for the new project
@@ -1126,6 +1127,7 @@ public Project createProject(Project project, String importUrl) throws GitLabApi
11261127
.withParam("ci_config_path", project.getCiConfigPath())
11271128
.withParam("suggestion_commit_message", project.getSuggestionCommitMessage())
11281129
.withParam("remove_source_branch_after_merge", project.getRemoveSourceBranchAfterMerge())
1130+
.withParam("auto_devops_enabled", project.getAutoDevopsEnabled())
11291131
.withParam("squash_option", project.getSquashOption());
11301132

11311133
Namespace namespace = project.getNamespace();

gitlab4j-models/src/main/java/org/gitlab4j/api/models/GroupFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
public class GroupFilter implements Serializable {
1616
private static final long serialVersionUID = 1L;
1717

18-
private List<Integer> skipGroups;
18+
private List<Long> skipGroups;
1919
private Boolean allAvailable;
2020
private String search;
2121
private GroupOrderBy orderBy;
@@ -33,7 +33,7 @@ public class GroupFilter implements Serializable {
3333
* @param skipGroups List of group IDs to not include in the search
3434
* @return the reference to this GroupFilter instance
3535
*/
36-
public GroupFilter withSkipGroups(List<Integer> skipGroups) {
36+
public GroupFilter withSkipGroups(List<Long> skipGroups) {
3737
this.skipGroups = skipGroups;
3838
return (this);
3939
}

gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueFilter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class IssueFilter implements Serializable {
2626
private static final long serialVersionUID = 1L;
2727

2828
/**
29-
* Return only the milestone having the given iid.
29+
* Return only the issues having the given iid.
3030
*/
31-
private List<String> iids;
31+
private List<Long> iids;
3232

3333
/**
3434
* {@link org.gitlab4j.models.Constants.IssueState} Return all issues or just those that are opened or closed.
@@ -146,11 +146,11 @@ public String toString() {
146146
}
147147

148148
/*- properties -*/
149-
public List<String> getIids() {
149+
public List<Long> getIids() {
150150
return iids;
151151
}
152152

153-
public void setIids(List<String> iids) {
153+
public void setIids(List<Long> iids) {
154154
this.iids = iids;
155155
}
156156

@@ -291,7 +291,7 @@ public void setNot(Map<IssueField, Object> not) {
291291
}
292292

293293
/*- builder -*/
294-
public IssueFilter withIids(List<String> iids) {
294+
public IssueFilter withIids(List<Long> iids) {
295295
this.iids = iids;
296296
return (this);
297297
}

gitlab4j-models/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public class MergeRequestFilter implements Serializable {
5050
private Long authorId;
5151

5252
private Long assigneeId;
53+
private Long reviewerId;
5354
private String myReactionEmoji;
5455
private String sourceBranch;
5556
private String targetBranch;
@@ -278,11 +279,24 @@ public void setAssigneeId(Long assigneeId) {
278279
this.assigneeId = assigneeId;
279280
}
280281

282+
public Long getReviewerId() {
283+
return reviewerId;
284+
}
285+
286+
public void setReviewerId(Long reviewerId) {
287+
this.reviewerId = reviewerId;
288+
}
289+
281290
public MergeRequestFilter withAssigneeId(Long assigneeId) {
282291
this.assigneeId = assigneeId;
283292
return (this);
284293
}
285294

295+
public MergeRequestFilter withReviewerId(Long reviewerId) {
296+
this.reviewerId = reviewerId;
297+
return (this);
298+
}
299+
286300
public String getMyReactionEmoji() {
287301
return myReactionEmoji;
288302
}
@@ -511,6 +525,7 @@ public GitLabForm getQueryParams() {
511525
.withParam("updated_before", updatedBefore)
512526
.withParam("scope", scope)
513527
.withParam("assignee_id", assigneeId)
528+
.withParam("reviewer_id", reviewerId)
514529
.withParam("my_reaction_emoji", myReactionEmoji)
515530
.withParam("source_branch", sourceBranch)
516531
.withParam("target_branch", targetBranch)

0 commit comments

Comments
 (0)