diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 18:06:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 18:06:17 +0300 |
commit | 238d22c07218adf2b8f3db630ee8b74ca6f29df5 (patch) | |
tree | 23fd5f85efef0fb95eb73bf6395d5b7e8c0f1b9f /spec/fixtures | |
parent | 6b75320f525f841454f1ab162d141d3610f2e77b (diff) |
Add latest changes from gitlab-org/gitlab@masterlist
Diffstat (limited to 'spec/fixtures')
-rw-r--r-- | spec/fixtures/api/schemas/evidences/author.json | 14 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/evidences/evidence.json | 11 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/evidences/issue.json | 5 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/evidences/milestone.json | 4 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/evidences/project.json | 2 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/evidences/release.json | 6 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/job/build_trace.json | 31 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/job/build_trace_line.json | 18 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/job/build_trace_line_content.json | 11 |
9 files changed, 79 insertions, 23 deletions
diff --git a/spec/fixtures/api/schemas/evidences/author.json b/spec/fixtures/api/schemas/evidences/author.json deleted file mode 100644 index 1b49446900a..00000000000 --- a/spec/fixtures/api/schemas/evidences/author.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "object", - "required": [ - "id", - "name", - "email" - ], - "properties": { - "id": { "type": "integer" }, - "name": { "type": "string" }, - "email": { "type": "string" } - }, - "additionalProperties": false -} diff --git a/spec/fixtures/api/schemas/evidences/evidence.json b/spec/fixtures/api/schemas/evidences/evidence.json new file mode 100644 index 00000000000..ea3861258e1 --- /dev/null +++ b/spec/fixtures/api/schemas/evidences/evidence.json @@ -0,0 +1,11 @@ +{ + "type": "object", + "required": [ + "release" + ], + "properties": { + "release": { "$ref": "release.json" } + }, + "additionalProperties": false +} + diff --git a/spec/fixtures/api/schemas/evidences/issue.json b/spec/fixtures/api/schemas/evidences/issue.json index 10e90dff455..fd9daf17ab8 100644 --- a/spec/fixtures/api/schemas/evidences/issue.json +++ b/spec/fixtures/api/schemas/evidences/issue.json @@ -14,13 +14,12 @@ "properties": { "id": { "type": "integer" }, "title": { "type": "string" }, - "description": { "type": "string" }, - "author": { "$ref": "author.json" }, + "description": { "type": ["string", "null"] }, "state": { "type": "string" }, "iid": { "type": "integer" }, "confidential": { "type": "boolean" }, "created_at": { "type": "date" }, - "due_date": { "type": "date" } + "due_date": { "type": ["date", "null"] } }, "additionalProperties": false } diff --git a/spec/fixtures/api/schemas/evidences/milestone.json b/spec/fixtures/api/schemas/evidences/milestone.json index 91f0f48bd4c..ab27fdecde2 100644 --- a/spec/fixtures/api/schemas/evidences/milestone.json +++ b/spec/fixtures/api/schemas/evidences/milestone.json @@ -13,11 +13,11 @@ "properties": { "id": { "type": "integer" }, "title": { "type": "string" }, - "description": { "type": "string" }, + "description": { "type": ["string", "null"] }, "state": { "type": "string" }, "iid": { "type": "integer" }, "created_at": { "type": "date" }, - "due_date": { "type": "date" }, + "due_date": { "type": ["date", "null"] }, "issues": { "type": "array", "items": { "$ref": "issue.json" } diff --git a/spec/fixtures/api/schemas/evidences/project.json b/spec/fixtures/api/schemas/evidences/project.json index 542686542f8..3a094bd276f 100644 --- a/spec/fixtures/api/schemas/evidences/project.json +++ b/spec/fixtures/api/schemas/evidences/project.json @@ -9,7 +9,7 @@ "properties": { "id": { "type": "integer" }, "name": { "type": "string" }, - "description": { "type": "string" }, + "description": { "type": ["string", "null"] }, "created_at": { "type": "date" } }, "additionalProperties": false diff --git a/spec/fixtures/api/schemas/evidences/release.json b/spec/fixtures/api/schemas/evidences/release.json index 68c872a9dc8..37eb9a9b5c0 100644 --- a/spec/fixtures/api/schemas/evidences/release.json +++ b/spec/fixtures/api/schemas/evidences/release.json @@ -2,7 +2,7 @@ "type": "object", "required": [ "id", - "tag", + "tag_name", "name", "description", "created_at", @@ -11,8 +11,8 @@ ], "properties": { "id": { "type": "integer" }, - "tag": { "type": "string" }, - "name": { "type": "string" }, + "tag_name": { "type": "string" }, + "name": { "type": ["string", "null"] }, "description": { "type": "string" }, "created_at": { "type": "date" }, "project": { "$ref": "project.json" }, diff --git a/spec/fixtures/api/schemas/job/build_trace.json b/spec/fixtures/api/schemas/job/build_trace.json new file mode 100644 index 00000000000..becd881ea57 --- /dev/null +++ b/spec/fixtures/api/schemas/job/build_trace.json @@ -0,0 +1,31 @@ +{ + "description": "Build trace", + "type": "object", + "required": [ + "id", + "status", + "complete", + "state", + "append", + "truncated", + "offset", + "size", + "total" + ], + "properties": { + "id": { "type": "integer" }, + "status": { "type": "string" }, + "complete": { "type": "boolean" }, + "state": { "type": ["string", "null"] }, + "append": { "type": ["boolean", "null"] }, + "truncated": { "type": ["boolean", "null"] }, + "offset": { "type": ["integer", "null"] }, + "size": { "type": ["integer", "null"] }, + "total": { "type": ["integer", "null"] }, + "html": { "type": ["string", "null"] }, + "lines": { + "type": ["array", "null"], + "items": { "$ref": "./build_trace_line.json" } + } + } +} diff --git a/spec/fixtures/api/schemas/job/build_trace_line.json b/spec/fixtures/api/schemas/job/build_trace_line.json new file mode 100644 index 00000000000..18726dff2bb --- /dev/null +++ b/spec/fixtures/api/schemas/job/build_trace_line.json @@ -0,0 +1,18 @@ +{ + "description": "Build trace line", + "type": "object", + "required": [ + "offset", + "content" + ], + "properties": { + "offset": { "type": "integer" }, + "content": { + "type": "array", + "items": { "$ref": "./build_trace_line_content.json" } + }, + "section": "string", + "section_header": "boolean", + "section_duration": "string" + } +} diff --git a/spec/fixtures/api/schemas/job/build_trace_line_content.json b/spec/fixtures/api/schemas/job/build_trace_line_content.json new file mode 100644 index 00000000000..41f8124c113 --- /dev/null +++ b/spec/fixtures/api/schemas/job/build_trace_line_content.json @@ -0,0 +1,11 @@ +{ + "description": "Build trace line content", + "type": "object", + "required": [ + "text" + ], + "properties": { + "text": { "type": "string" }, + "style": { "type": "string" } + } +} |