summaryrefslogtreecommitdiff
path: root/spec/fixtures/api/schemas/entities/merge_request_basic.json
diff options
context:
space:
mode:
Diffstat (limited to 'spec/fixtures/api/schemas/entities/merge_request_basic.json')
-rw-r--r--spec/fixtures/api/schemas/entities/merge_request_basic.json17
1 files changed, 16 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 46031961cca..cf257ac00de 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_basic.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_basic.json
@@ -13,7 +13,22 @@
"assignee_id": { "type": ["integer", "null"] },
"subscribed": { "type": ["boolean", "null"] },
"participants": { "type": "array" },
- "allow_maintainer_to_push": { "type": "boolean"}
+ "allow_collaboration": { "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
}