Commit 2de02ed7 authored by Gautier de Saint Martin Lacaze's avatar Gautier de Saint Martin Lacaze Committed by Greg Messner
Browse files

Update property name from approvals missing to approvals left (#460)

parent 4afb5ded
...@@ -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 approvalsMissing; private Integer approvalsLeft;
@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 getApprovalsMissing() { public Integer getApprovalsLeft() {
return approvalsMissing; return approvalsLeft;
} }
/** /**
...@@ -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 approvalsMissing the number of approvals missing for the merge request * @param approvalsLeft the number of approvals missing for the merge request
*/ */
public void setApprovalsMissing(Integer approvalsMissing) { public void setApprovalsLeft(Integer approvalsLeft) {
this.approvalsMissing = approvalsMissing; this.approvalsLeft = approvalsLeft;
} }
/** /**
......
...@@ -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": {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment