Commit 7fbf94dc authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'patch-7' into 'master'

Change approvals_missing to approvals_left.

See merge request gitlab-org/gitlab-ee!5494
parents 1fdadb25 f01e55fa
...@@ -211,7 +211,7 @@ GET /projects/:id/merge_requests/:merge_request_iid/approvals ...@@ -211,7 +211,7 @@ GET /projects/:id/merge_requests/:merge_request_iid/approvals
"updated_at": "2016-06-08T21:20:42.470Z", "updated_at": "2016-06-08T21:20:42.470Z",
"merge_status": "cannot_be_merged", "merge_status": "cannot_be_merged",
"approvals_required": 2, "approvals_required": 2,
"approvals_missing": 1, "approvals_left": 1,
"approved_by": [ "approved_by": [
{ {
"user": { "user": {
...@@ -261,7 +261,7 @@ POST /projects/:id/merge_requests/:merge_request_iid/approvals ...@@ -261,7 +261,7 @@ POST /projects/:id/merge_requests/:merge_request_iid/approvals
"updated_at": "2016-06-08T21:20:42.470Z", "updated_at": "2016-06-08T21:20:42.470Z",
"merge_status": "cannot_be_merged", "merge_status": "cannot_be_merged",
"approvals_required": 2, "approvals_required": 2,
"approvals_missing": 2, "approvals_left": 2,
"approved_by": [], "approved_by": [],
"approvers": [], "approvers": [],
"approver_groups": [] "approver_groups": []
...@@ -302,7 +302,7 @@ PUT /projects/:id/merge_requests/:merge_request_iid/approvers ...@@ -302,7 +302,7 @@ PUT /projects/:id/merge_requests/:merge_request_iid/approvers
"updated_at": "2016-06-08T21:20:42.470Z", "updated_at": "2016-06-08T21:20:42.470Z",
"merge_status": "cannot_be_merged", "merge_status": "cannot_be_merged",
"approvals_required": 2, "approvals_required": 2,
"approvals_missing": 2, "approvals_left": 2,
"approved_by": [], "approved_by": [],
"approvers": [ "approvers": [
{ {
......
Markdown is supported
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