Skip to content

Deprecate MergeRequest#mergeStatus #885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 17, 2023
Merged

Deprecate MergeRequest#mergeStatus #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b192657
Deprecate MergeRequest#mergeStatus
marcelstoer Dec 13, 2022
ad8ab1e
Update src/main/java/org/gitlab4j/api/models/MergeRequest.java
marcelstoer Dec 15, 2022
291323f
Update src/main/java/org/gitlab4j/api/models/MergeRequest.java
marcelstoer Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/main/java/org/gitlab4j/api/models/MergeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,13 @@ public class MergeRequest {
private Date latestBuildStartedAt;
private String mergeCommitSha;
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 detailedMergeStatus;
private Date mergedAt;
private Participant mergedBy;
private Boolean mergeWhenPipelineSucceeds;
Expand Down Expand Up @@ -273,14 +279,30 @@ public void setSquashCommitSha(String squashCommitSha) {
this.squashCommitSha = squashCommitSha;
}

/**
* @deprecated since 15.6, use {@link #getDetailedMergeStatus()} instead.
*/
@Deprecated
public String getMergeStatus() {
return mergeStatus;
}

/**
* @deprecated since 15.6, use {@link #setDetailedMergeStatus(String)} instead.
*/
@Deprecated
public void setMergeStatus(String mergeStatus) {
this.mergeStatus = mergeStatus;
}

public String getDetailedMergeStatus() {
return detailedMergeStatus;
}

public void setDetailedMergeStatus(String detailedMergeStatus) {
this.detailedMergeStatus = detailedMergeStatus;
}

public Date getMergedAt() {
return mergedAt;
}
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/org/gitlab4j/api/merge-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"project_id":3,
"title":"test1",
"state":"merged",
"detailed_merge_status": "can_be_merged",
"upvotes":0,
"downvotes":0,
"created_at": "2016-12-03T17:23:34Z",
Expand Down