Skip to content
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

Jump to bottom

Deprecate MergeRequest#mergeStatus #885

Merged
merged 3 commits into from
Mar 17, 2023
Merged

Deprecate MergeRequest#mergeStatus #885

merged 3 commits into from
Mar 17, 2023
+23 −0

Conversation

marcelstoer
Copy link
Contributor

Fixes #880

@marcelstoer @jmini
Update src/main/java/org/gitlab4j/api/models/MergeRequest.java

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
ad8ab1e 
Co-authored-by: Jérémie Bresson <[email protected]>
@jmini
Copy link
Collaborator

jmini commented Mar 6, 2023

IMO this change should update the corresponding test:
https://github.com/gitlab4j/gitlab4j-api/blob/master/src/test/resources/org/gitlab4j/api/merge-request.json

By adding a line like:

  "detailed_merge_status": "can_be_merged",

See doc: https://docs.gitlab.com/ee/api/merge_requests.html#response

jmini
jmini approved these changes Mar 17, 2023
View reviewed changes
Copy link
Collaborator

@jmini jmini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@jmini jmini merged commit ea9042e into gitlab4j:master Mar 17, 2023
@marcelstoer marcelstoer deleted the fix/merge-status branch March 17, 2023 10:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmini jmini

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Deprecation of the merge_status API field
2 participants
@marcelstoer @jmini