diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 18:09:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 18:09:23 +0000 |
| commit | 76e9fc7b29c1ce716c26932e9fbec0f3c99f53f4 (patch) | |
| tree | b5ca8e3a6b2cf93b67257b38ee71e2efee177700 /spec/fixtures | |
| parent | a210c43e0aca0311cc1d3d381763b25979ec72dc (diff) | |
| download | gitlab-ce-76e9fc7b29c1ce716c26932e9fbec0f3c99f53f4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
3 files changed, 32 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/milestone_with_stats.json b/spec/fixtures/api/schemas/public_api/v4/milestone_with_stats.json new file mode 100644 index 00000000000..e2475545ee9 --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/milestone_with_stats.json @@ -0,0 +1,30 @@ +{ + "type": "object", + "properties" : { + "id": { "type": "integer" }, + "iid": { "type": "integer" }, + "project_id": { "type": ["integer", "null"] }, + "group_id": { "type": ["integer", "null"] }, + "title": { "type": "string" }, + "description": { "type": ["string", "null"] }, + "state": { "type": "string" }, + "created_at": { "type": "date" }, + "updated_at": { "type": "date" }, + "start_date": { "type": "date" }, + "due_date": { "type": "date" }, + "web_url": { "type": "string" }, + "issue_stats": { + "required": ["total", "closed"], + "properties": { + "total": { "type": "integer" }, + "closed": { "type": "integer" } + }, + "additionalProperties": false + } + }, + "required": [ + "id", "iid", "title", "description", "state", + "state", "created_at", "updated_at", "start_date", "due_date", "issue_stats" + ], + "additionalProperties": false +} diff --git a/spec/fixtures/api/schemas/public_api/v4/release.json b/spec/fixtures/api/schemas/public_api/v4/release.json index 46703c69dc0..a239be09919 100644 --- a/spec/fixtures/api/schemas/public_api/v4/release.json +++ b/spec/fixtures/api/schemas/public_api/v4/release.json @@ -17,7 +17,7 @@ }, "milestones": { "type": "array", - "items": { "$ref": "milestone.json" } + "items": { "$ref": "milestone_with_stats.json" } }, "commit_path": { "type": "string" }, "tag_path": { "type": "string" }, diff --git a/spec/fixtures/api/schemas/public_api/v4/release/release_for_guest.json b/spec/fixtures/api/schemas/public_api/v4/release/release_for_guest.json index bce74892059..1a1e92ac778 100644 --- a/spec/fixtures/api/schemas/public_api/v4/release/release_for_guest.json +++ b/spec/fixtures/api/schemas/public_api/v4/release/release_for_guest.json @@ -10,7 +10,7 @@ "upcoming_release": { "type": "boolean" }, "milestones": { "type": "array", - "items": { "$ref": "../milestone.json" } + "items": { "$ref": "../milestone_with_stats.json" } }, "commit_path": { "type": "string" }, "tag_path": { "type": "string" }, |