Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
ea9042ee
Unverified
Commit
ea9042ee
authored
Mar 17, 2023
by
Marcel Stör
Committed by
GitHub
Mar 17, 2023
Browse files
Deprecate MergeRequest#mergeStatus (#885)
Co-authored-by:
Jérémie Bresson
<
dev@jmini.fr
>
parent
b2942f39
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/models/MergeRequest.java
View file @
ea9042ee
...
...
@@ -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
;
...
...
@@ -273,14 +279,30 @@ public class MergeRequest {
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
;
}
...
...
src/test/resources/org/gitlab4j/api/merge-request.json
View file @
ea9042ee
...
...
@@ -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"
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment