File tree 2 files changed +23
-0
lines changed
main/java/org/gitlab4j/api/models
test/resources/org/gitlab4j/api
2 files changed +23
-0
lines changed Original file line number Diff line number Diff line change @@ -36,7 +36,13 @@ public class MergeRequest {
36
36
private Date latestBuildStartedAt ;
37
37
private String mergeCommitSha ;
38
38
private String squashCommitSha ;
39
+ /**
40
+ * @deprecated since 15.6, use {@link #detailedMergeStatus} instead.
41
+ * see https://docs.gitlab.com/ee/update/deprecations.html#merge_status-api-field
42
+ */
43
+ @ Deprecated
39
44
private String mergeStatus ;
45
+ private String detailedMergeStatus ;
40
46
private Date mergedAt ;
41
47
private Participant mergedBy ;
42
48
private Boolean mergeWhenPipelineSucceeds ;
@@ -273,14 +279,30 @@ public void setSquashCommitSha(String squashCommitSha) {
273
279
this .squashCommitSha = squashCommitSha ;
274
280
}
275
281
282
+ /**
283
+ * @deprecated since 15.6, use {@link #getDetailedMergeStatus()} instead.
284
+ */
285
+ @ Deprecated
276
286
public String getMergeStatus () {
277
287
return mergeStatus ;
278
288
}
279
289
290
+ /**
291
+ * @deprecated since 15.6, use {@link #setDetailedMergeStatus(String)} instead.
292
+ */
293
+ @ Deprecated
280
294
public void setMergeStatus (String mergeStatus ) {
281
295
this .mergeStatus = mergeStatus ;
282
296
}
283
297
298
+ public String getDetailedMergeStatus () {
299
+ return detailedMergeStatus ;
300
+ }
301
+
302
+ public void setDetailedMergeStatus (String detailedMergeStatus ) {
303
+ this .detailedMergeStatus = detailedMergeStatus ;
304
+ }
305
+
284
306
public Date getMergedAt () {
285
307
return mergedAt ;
286
308
}
Original file line number Diff line number Diff line change 6
6
"project_id" :3 ,
7
7
"title" :" test1" ,
8
8
"state" :" merged" ,
9
+ "detailed_merge_status" : " can_be_merged" ,
9
10
"upvotes" :0 ,
10
11
"downvotes" :0 ,
11
12
"created_at" : " 2016-12-03T17:23:34Z" ,
You can’t perform that action at this time.
0 commit comments