Skip to content

Commit 3f55ecf

Browse files
authored
Add mergeUser to MergeRequest (gitlab4j#910)
Fixes gitlab4j#889
1 parent 0b32741 commit 3f55ecf

File tree

2 files changed

+31
-0
lines changed

2 files changed

+31
-0
lines changed

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

+23
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ public class MergeRequest {
4444
private String mergeStatus;
4545
private String detailedMergeStatus;
4646
private Date mergedAt;
47+
/**
48+
* @deprecated since 14.7, use {@link #mergeUser} instead.
49+
* see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field
50+
*/
4751
private Participant mergedBy;
52+
private Participant mergeUser;
4853
private Boolean mergeWhenPipelineSucceeds;
4954
private String mergeError;
5055
private Milestone milestone;
@@ -311,14 +316,32 @@ public void setMergedAt(Date mergedAt) {
311316
this.mergedAt = mergedAt;
312317
}
313318

319+
/**
320+
* @deprecated since 14.7, use {@link #getMergeUser()} instead.
321+
* see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field
322+
*/
323+
@Deprecated
314324
public Participant getMergedBy() {
315325
return mergedBy;
316326
}
317327

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

337+
public Participant getMergeUser() {
338+
return mergeUser;
339+
}
340+
341+
public void setMergeUser(Participant mergeUser) {
342+
this.mergeUser = mergeUser;
343+
}
344+
322345
public Boolean getMergeWhenPipelineSucceeds() {
323346
return mergeWhenPipelineSucceeds;
324347
}

src/test/resources/org/gitlab4j/api/merge-request.json

+8
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@
2121
"avatar_url": "https://www.google.com/",
2222
"web_url": "https://www.google.com/"
2323
},
24+
"merge_user": {
25+
"id": 87854,
26+
"name": "Douwe Maan",
27+
"username": "DouweM",
28+
"state": "active",
29+
"avatar_url": "https://gitlab.example.com/uploads/-/system/user/avatar/87854/avatar.png",
30+
"web_url": "https://gitlab.com/DouweM"
31+
},
2432
"merge_error": "Merge request is not mergeable",
2533
"author":{
2634
"id":1,

0 commit comments

Comments
 (0)