@@ -44,7 +44,12 @@ public class MergeRequest {
44
44
private String mergeStatus ;
45
45
private String detailedMergeStatus ;
46
46
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
+ */
47
51
private Participant mergedBy ;
52
+ private Participant mergeUser ;
48
53
private Boolean mergeWhenPipelineSucceeds ;
49
54
private String mergeError ;
50
55
private Milestone milestone ;
@@ -311,14 +316,32 @@ public void setMergedAt(Date mergedAt) {
311
316
this .mergedAt = mergedAt ;
312
317
}
313
318
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
314
324
public Participant getMergedBy () {
315
325
return mergedBy ;
316
326
}
317
327
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
318
333
public void setMergedBy (Participant mergedBy ) {
319
334
this .mergedBy = mergedBy ;
320
335
}
321
336
337
+ public Participant getMergeUser () {
338
+ return mergeUser ;
339
+ }
340
+
341
+ public void setMergeUser (Participant mergeUser ) {
342
+ this .mergeUser = mergeUser ;
343
+ }
344
+
322
345
public Boolean getMergeWhenPipelineSucceeds () {
323
346
return mergeWhenPipelineSucceeds ;
324
347
}
0 commit comments