Unverified Commit ea9042ee authored by Marcel Stör's avatar Marcel Stör Committed by GitHub
Browse files

Deprecate MergeRequest#mergeStatus (#885)



Co-authored-by: default avatarJérémie Bresson <dev@jmini.fr>
parent b2942f39
...@@ -36,7 +36,13 @@ public class MergeRequest { ...@@ -36,7 +36,13 @@ public class MergeRequest {
private Date latestBuildStartedAt; private Date latestBuildStartedAt;
private String mergeCommitSha; private String mergeCommitSha;
private String squashCommitSha; private String squashCommitSha;
/**
* @deprecated since 15.6, use {@link #detailedMergeStatus} instead.
* see https://docs.gitlab.com/ee/update/deprecations.html#merge_status-api-field
*/
@Deprecated
private String mergeStatus; private String mergeStatus;
private String detailedMergeStatus;
private Date mergedAt; private Date mergedAt;
private Participant mergedBy; private Participant mergedBy;
private Boolean mergeWhenPipelineSucceeds; private Boolean mergeWhenPipelineSucceeds;
...@@ -273,14 +279,30 @@ public class MergeRequest { ...@@ -273,14 +279,30 @@ public class MergeRequest {
this.squashCommitSha = squashCommitSha; this.squashCommitSha = squashCommitSha;
} }
/**
* @deprecated since 15.6, use {@link #getDetailedMergeStatus()} instead.
*/
@Deprecated
public String getMergeStatus() { public String getMergeStatus() {
return mergeStatus; return mergeStatus;
} }
/**
* @deprecated since 15.6, use {@link #setDetailedMergeStatus(String)} instead.
*/
@Deprecated
public void setMergeStatus(String mergeStatus) { public void setMergeStatus(String mergeStatus) {
this.mergeStatus = mergeStatus; this.mergeStatus = mergeStatus;
} }
public String getDetailedMergeStatus() {
return detailedMergeStatus;
}
public void setDetailedMergeStatus(String detailedMergeStatus) {
this.detailedMergeStatus = detailedMergeStatus;
}
public Date getMergedAt() { public Date getMergedAt() {
return mergedAt; return mergedAt;
} }
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
"project_id":3, "project_id":3,
"title":"test1", "title":"test1",
"state":"merged", "state":"merged",
"detailed_merge_status": "can_be_merged",
"upvotes":0, "upvotes":0,
"downvotes":0, "downvotes":0,
"created_at": "2016-12-03T17:23:34Z", "created_at": "2016-12-03T17:23:34Z",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment