Skip to content

Commit 4553e1c

Browse files
committed
Add mergeUser to MergeRequest
Fixes #889
1 parent a00b1f0 commit 4553e1c

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ public class MergeRequest {
3838
private String squashCommitSha;
3939
private String mergeStatus;
4040
private Date mergedAt;
41+
/**
42+
* @deprecated since 14.7, use {@link #mergeUser} instead.
43+
* see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field
44+
*/
4145
private Participant mergedBy;
46+
private Participant mergeUser;
4247
private Boolean mergeWhenPipelineSucceeds;
4348
private String mergeError;
4449
private Milestone milestone;
@@ -289,14 +294,32 @@ public void setMergedAt(Date mergedAt) {
289294
this.mergedAt = mergedAt;
290295
}
291296

297+
/**
298+
* @deprecated since 14.7, use {@link #getMergeUser()} instead.
299+
* see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field
300+
*/
301+
@Deprecated
292302
public Participant getMergedBy() {
293303
return mergedBy;
294304
}
295305

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

315+
public Participant getMergeUser() {
316+
return mergeUser;
317+
}
318+
319+
public void setMergeUser(Participant mergeUser) {
320+
this.mergeUser = mergeUser;
321+
}
322+
300323
public Boolean getMergeWhenPipelineSucceeds() {
301324
return mergeWhenPipelineSucceeds;
302325
}

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

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

0 commit comments

Comments
 (0)