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
3f55ecf9
Unverified
Commit
3f55ecf9
authored
Mar 30, 2023
by
Jérémie Bresson
Committed by
GitHub
Mar 30, 2023
Browse files
Add mergeUser to MergeRequest (#910)
Fixes #889
parent
0b32741d
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/models/MergeRequest.java
View file @
3f55ecf9
...
...
@@ -44,7 +44,12 @@ public class MergeRequest {
private
String
mergeStatus
;
private
String
detailedMergeStatus
;
private
Date
mergedAt
;
/**
* @deprecated since 14.7, use {@link #mergeUser} instead.
* see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field
*/
private
Participant
mergedBy
;
private
Participant
mergeUser
;
private
Boolean
mergeWhenPipelineSucceeds
;
private
String
mergeError
;
private
Milestone
milestone
;
...
...
@@ -311,14 +316,32 @@ public class MergeRequest {
this
.
mergedAt
=
mergedAt
;
}
/**
* @deprecated since 14.7, use {@link #getMergeUser()} instead.
* see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field
*/
@Deprecated
public
Participant
getMergedBy
()
{
return
mergedBy
;
}
/**
* @deprecated since 14.7, use {@link #setMergeUser(Participant)} instead.
* see https://docs.gitlab.com/ee/update/deprecations.html#merged_by-api-field
*/
@Deprecated
public
void
setMergedBy
(
Participant
mergedBy
)
{
this
.
mergedBy
=
mergedBy
;
}
public
Participant
getMergeUser
()
{
return
mergeUser
;
}
public
void
setMergeUser
(
Participant
mergeUser
)
{
this
.
mergeUser
=
mergeUser
;
}
public
Boolean
getMergeWhenPipelineSucceeds
()
{
return
mergeWhenPipelineSucceeds
;
}
...
...
src/test/resources/org/gitlab4j/api/merge-request.json
View file @
3f55ecf9
...
...
@@ -21,6 +21,14 @@
"avatar_url"
:
"https://www.google.com/"
,
"web_url"
:
"https://www.google.com/"
},
"merge_user"
:
{
"id"
:
87854
,
"name"
:
"Douwe Maan"
,
"username"
:
"DouweM"
,
"state"
:
"active"
,
"avatar_url"
:
"https://gitlab.example.com/uploads/-/system/user/avatar/87854/avatar.png"
,
"web_url"
:
"https://gitlab.com/DouweM"
},
"merge_error"
:
"Merge request is not mergeable"
,
"author"
:{
"id"
:
1
,
...
...
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