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
5f840438
Commit
5f840438
authored
Oct 02, 2019
by
Adam Lesiak
Committed by
Greg Messner
Oct 02, 2019
Browse files
Added MergeRequest.mergeError (#444) (#445)
parent
ad3eed8e
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/models/MergeRequest.java
View file @
5f840438
...
@@ -31,6 +31,7 @@ public class MergeRequest {
...
@@ -31,6 +31,7 @@ public class MergeRequest {
private
Date
mergedAt
;
private
Date
mergedAt
;
private
Participant
mergedBy
;
private
Participant
mergedBy
;
private
Boolean
mergeWhenPipelineSucceeds
;
private
Boolean
mergeWhenPipelineSucceeds
;
private
String
mergeError
;
private
Milestone
milestone
;
private
Milestone
milestone
;
private
Integer
projectId
;
private
Integer
projectId
;
private
String
sha
;
private
String
sha
;
...
@@ -228,6 +229,14 @@ public class MergeRequest {
...
@@ -228,6 +229,14 @@ public class MergeRequest {
this
.
mergeWhenPipelineSucceeds
=
mergeWhenPipelineSucceeds
;
this
.
mergeWhenPipelineSucceeds
=
mergeWhenPipelineSucceeds
;
}
}
public
String
getMergeError
()
{
return
mergeError
;
}
public
void
setMergeError
(
String
mergeError
)
{
this
.
mergeError
=
mergeError
;
}
public
Milestone
getMilestone
()
{
public
Milestone
getMilestone
()
{
return
milestone
;
return
milestone
;
}
}
...
...
src/test/resources/org/gitlab4j/api/merge-request.json
View file @
5f840438
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
"avatar_url"
:
"https://www.google.com/"
,
"avatar_url"
:
"https://www.google.com/"
,
"web_url"
:
"https://www.google.com/"
"web_url"
:
"https://www.google.com/"
},
},
"merge_error"
:
"Merge request is not mergeable"
,
"author"
:{
"author"
:{
"id"
:
1
,
"id"
:
1
,
"username"
:
"admin"
,
"username"
:
"admin"
,
...
...
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