diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-05-04 15:11:15 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-05-04 17:11:53 +0300 |
| commit | 387c4b2c21a44360386a9b8ce6849e7f1b8a3de9 (patch) | |
| tree | 446b8338efe8ad22ca03b00b2dc72b22c4174e02 /spec/fixtures | |
| parent | 68c12e15cc236548918f91393ebef3c06c124814 (diff) | |
Backport of multiple_assignees_feature [ci skip]
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/issue.json | 20 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/issues.json | 17 |
2 files changed, 36 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/issue.json b/spec/fixtures/api/schemas/issue.json index 21c078e0f44..983beb838b7 100644 --- a/spec/fixtures/api/schemas/issue.json +++ b/spec/fixtures/api/schemas/issue.json @@ -40,11 +40,31 @@ "additionalProperties": false } }, +<<<<<<< HEAD "assignee": { "id": { "type": "integet" }, "name": { "type": "string" }, "username": { "type": "string" }, "avatar_url": { "type": "uri" } +======= + "assignees": { + "type": "array", + "items": { + "type": ["object", "null"], + "required": [ + "id", + "name", + "username", + "avatar_url" + ], + "properties": { + "id": { "type": "integer" }, + "name": { "type": "string" }, + "username": { "type": "string" }, + "avatar_url": { "type": "uri" } + } + } +>>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master }, "subscribed": { "type": ["boolean", "null"] } }, diff --git a/spec/fixtures/api/schemas/public_api/v4/issues.json b/spec/fixtures/api/schemas/public_api/v4/issues.json index 52199e75734..2d1c84ee93d 100644 --- a/spec/fixtures/api/schemas/public_api/v4/issues.json +++ b/spec/fixtures/api/schemas/public_api/v4/issues.json @@ -33,6 +33,21 @@ }, "additionalProperties": false }, + "assignees": { + "type": "array", + "items": { + "type": ["object", "null"], + "properties": { + "name": { "type": "string" }, + "username": { "type": "string" }, + "id": { "type": "integer" }, + "state": { "type": "string" }, + "avatar_url": { "type": "uri" }, + "web_url": { "type": "uri" } + }, + "additionalProperties": false + } + }, "assignee": { "type": ["object", "null"], "properties": { @@ -67,7 +82,7 @@ "required": [ "id", "iid", "project_id", "title", "description", "state", "created_at", "updated_at", "labels", - "milestone", "assignee", "author", "user_notes_count", + "milestone", "assignees", "author", "user_notes_count", "upvotes", "downvotes", "due_date", "confidential", "web_url" ], |