Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mergeUser to MergeRequest #910

Merged
merged 1 commit into from
Mar 30, 2023
Merged

Add mergeUser to MergeRequest #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/main/java/org/gitlab4j/api/models/MergeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ public class MergeRequest {
private String squashCommitSha;
private String mergeStatus;
private Date mergedAt;
/**
* @deprecated since 14.7, use {@link #mergeUser} instead.
* see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field
*/
private Participant mergedBy;
private Participant mergeUser;
private Boolean mergeWhenPipelineSucceeds;
private String mergeError;
private Milestone milestone;
Expand Down Expand Up @@ -289,14 +294,32 @@ public void setMergedAt(Date mergedAt) {
this.mergedAt = mergedAt;
}

/**
* @deprecated since 14.7, use {@link #getMergeUser()} instead.
* see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field
*/
@Deprecated
public Participant getMergedBy() {
return mergedBy;
}

/**
* @deprecated since 14.7, use {@link #setMergeUser(Participant)} instead.
* see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field
*/
@Deprecated
public void setMergedBy(Participant mergedBy) {
this.mergedBy = mergedBy;
}

public Participant getMergeUser() {
return mergeUser;
}

public void setMergeUser(Participant mergeUser) {
this.mergeUser = mergeUser;
}

public Boolean getMergeWhenPipelineSucceeds() {
return mergeWhenPipelineSucceeds;
}
Expand Down
8 changes: 8 additions & 0 deletions src/test/resources/org/gitlab4j/api/merge-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
"avatar_url": "https://www.google.com/",
"web_url": "https://www.google.com/"
},
"merge_user": {
"id": 87854,
"name": "Douwe Maan",
"username": "DouweM",
"state": "active",
"avatar_url": "https://gitlab.example.com/uploads/-/system/user/avatar/87854/avatar.png",
"web_url": "https://gitlab.com/DouweM"
},
"merge_error": "Merge request is not mergeable",
"author":{
"id":1,
Expand Down