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
2de02ed7
Commit
2de02ed7
authored
Oct 29, 2019
by
Gautier de Saint Martin Lacaze
Committed by
Greg Messner
Oct 28, 2019
Browse files
Update property name from approvals missing to approvals left (#460)
parent
4afb5ded
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/models/MergeRequest.java
View file @
2de02ed7
...
@@ -55,7 +55,7 @@ public class MergeRequest {
...
@@ -55,7 +55,7 @@ public class MergeRequest {
// The approval fields will only be available when listing approvals, approving or unapproving a merge reuest.
// The approval fields will only be available when listing approvals, approving or unapproving a merge reuest.
private
Integer
approvalsRequired
;
private
Integer
approvalsRequired
;
private
Integer
approvals
Missing
;
private
Integer
approvals
Left
;
@JsonSerialize
(
using
=
JacksonJson
.
UserListSerializer
.
class
)
@JsonSerialize
(
using
=
JacksonJson
.
UserListSerializer
.
class
)
@JsonDeserialize
(
using
=
JacksonJson
.
UserListDeserializer
.
class
)
@JsonDeserialize
(
using
=
JacksonJson
.
UserListDeserializer
.
class
)
...
@@ -412,14 +412,14 @@ public class MergeRequest {
...
@@ -412,14 +412,14 @@ public class MergeRequest {
}
}
/**
/**
* Get the number of approvals
missing
for the merge request.
* Get the number of approvals
left
for the merge request.
*
*
* NOTE: This property will only be used when listing, approiving, or unapproving a merge request.
* NOTE: This property will only be used when listing, approiving, or unapproving a merge request.
*
*
* @return the number of approvals
missing
for the merge request
* @return the number of approvals
left
for the merge request
*/
*/
public
Integer
getApprovals
Missing
()
{
public
Integer
getApprovals
Left
()
{
return
approvals
Missing
;
return
approvals
Left
;
}
}
/**
/**
...
@@ -427,10 +427,10 @@ public class MergeRequest {
...
@@ -427,10 +427,10 @@ public class MergeRequest {
*
*
* NOTE: This property will only be used when listing, approiving, or unapproving a merge request.
* NOTE: This property will only be used when listing, approiving, or unapproving a merge request.
*
*
* @param approvals
Missing
the number of approvals missing for the merge request
* @param approvals
Left
the number of approvals missing for the merge request
*/
*/
public
void
setApprovals
Missing
(
Integer
approvals
Missing
)
{
public
void
setApprovals
Left
(
Integer
approvals
Left
)
{
this
.
approvals
Missing
=
approvals
Missing
;
this
.
approvals
Left
=
approvals
Left
;
}
}
/**
/**
...
...
src/test/resources/org/gitlab4j/api/approvals.json
View file @
2de02ed7
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
"updated_at"
:
"2016-06-08T21:20:42.470Z"
,
"updated_at"
:
"2016-06-08T21:20:42.470Z"
,
"merge_status"
:
"can_be_merged"
,
"merge_status"
:
"can_be_merged"
,
"approvals_required"
:
2
,
"approvals_required"
:
2
,
"approvals_
missing
"
:
1
,
"approvals_
left
"
:
1
,
"approved_by"
:
[
"approved_by"
:
[
{
{
"user"
:
{
"user"
:
{
...
...
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