File tree Expand file tree Collapse file tree 2 files changed +23
-0
lines changed
main/java/org/gitlab4j/api/models
test/resources/org/gitlab4j/api Expand file tree Collapse file tree 2 files changed +23
-0
lines changed Original file line number Diff line number Diff line change @@ -36,7 +36,13 @@ public class MergeRequest {
3636 private Date latestBuildStartedAt ;
3737 private String mergeCommitSha ;
3838 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
3944 private String mergeStatus ;
45+ private String detailedMergeStatus ;
4046 private Date mergedAt ;
4147 private Participant mergedBy ;
4248 private Boolean mergeWhenPipelineSucceeds ;
@@ -273,14 +279,30 @@ public void setSquashCommitSha(String squashCommitSha) {
273279 this .squashCommitSha = squashCommitSha ;
274280 }
275281
282+ /**
283+ * @deprecated since 15.6, use {@link #getDetailedMergeStatus()} instead.
284+ */
285+ @ Deprecated
276286 public String getMergeStatus () {
277287 return mergeStatus ;
278288 }
279289
290+ /**
291+ * @deprecated since 15.6, use {@link #setDetailedMergeStatus(String)} instead.
292+ */
293+ @ Deprecated
280294 public void setMergeStatus (String mergeStatus ) {
281295 this .mergeStatus = mergeStatus ;
282296 }
283297
298+ public String getDetailedMergeStatus () {
299+ return detailedMergeStatus ;
300+ }
301+
302+ public void setDetailedMergeStatus (String detailedMergeStatus ) {
303+ this .detailedMergeStatus = detailedMergeStatus ;
304+ }
305+
284306 public Date getMergedAt () {
285307 return mergedAt ;
286308 }
Original file line number Diff line number Diff line change 66 "project_id" :3 ,
77 "title" :" test1" ,
88 "state" :" merged" ,
9+ "detailed_merge_status" : " can_be_merged" ,
910 "upvotes" :0 ,
1011 "downvotes" :0 ,
1112 "created_at" : " 2016-12-03T17:23:34Z" ,
You can’t perform that action at this time.
0 commit comments