diff options
| author | Mario de la Ossa <mariodelaossa@gmail.com> | 2018-06-14 13:39:17 -0600 |
|---|---|---|
| committer | Mario de la Ossa <mariodelaossa@gmail.com> | 2018-06-15 17:46:49 -0600 |
| commit | c6420ce2ab18681d6a5b06621d89775e3cf81065 (patch) | |
| tree | 09c00408052a9a678d3c99b0c2412e2a699a63e9 /spec/fixtures | |
| parent | edfa2e3fb673412272e8bc9cdbfa2e3a86a9f21f (diff) | |
| download | gitlab-ce-c6420ce2ab18681d6a5b06621d89775e3cf81065.tar.gz | |
Fix milestones disappearing when changed on MR47933-MR-invisible-milestone
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_basic.json | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_basic.json b/spec/fixtures/api/schemas/entities/merge_request_basic.json index f7bc137c90c..cf257ac00de 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_basic.json +++ b/spec/fixtures/api/schemas/entities/merge_request_basic.json @@ -14,7 +14,21 @@ "subscribed": { "type": ["boolean", "null"] }, "participants": { "type": "array" }, "allow_collaboration": { "type": "boolean"}, - "allow_maintainer_to_push": { "type": "boolean"} + "allow_maintainer_to_push": { "type": "boolean"}, + "assignee": { + "oneOf": [ + { "type": "null" }, + { "$ref": "user.json" } + ] + }, + "milestone": { + "type": [ "object", "null" ] + }, + "labels": { + "type": [ "array", "null" ] + }, + "task_status": { "type": "string" }, + "task_status_short": { "type": "string" } }, "additionalProperties": false } |