diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-05-07 18:55:28 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-05-07 18:55:28 +0300 |
| commit | 10b6daf4915d320698a1a6c68b4530ab22f7880e (patch) | |
| tree | 72d8df0204d61e7f518ea27c6823cf9048fa8ed0 | |
| parent | a8710516a51e10af6b2d8cc8d686cdc9c11a758b (diff) | |
Update MR json schema
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json index 306dc5d38e9..0a7e0e2d5f2 100644 --- a/spec/fixtures/api/schemas/entities/merge_request.json +++ b/spec/fixtures/api/schemas/entities/merge_request.json @@ -44,7 +44,6 @@ "mergeable_discussions_state": { "type": "boolean" }, "conflicts_can_be_resolved_in_ui": { "type": "boolean" }, "branch_missing": { "type": "boolean" }, - "has_no_commits": { "type": "boolean" }, "has_conflicts": { "type": "boolean" }, "can_be_merged": { "type": "boolean" }, "project_archived": { "type": "boolean" }, @@ -92,7 +91,8 @@ "merge_commit_message_with_description": { "type": "string" }, "diverged_commits_count": { "type": "integer" }, "commit_change_content_path": { "type": "string" }, - "remove_wip_path": { "type": "string" } + "remove_wip_path": { "type": "string" }, + "commits_count": { "type": "integer" } }, "additionalProperties": false } |