diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/fixtures/api/schemas/public_api/v4 | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/fixtures/api/schemas/public_api/v4')
4 files changed, 10 insertions, 12 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json b/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json index f057adba65c..93b6dcde080 100644 --- a/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json +++ b/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json @@ -7,7 +7,10 @@ "id": { "type": "integer" }, "package_id": { "type": "integer" }, "file_name": { "type": "string" }, - "file_sha1": { "type": "string" } + "file_sha1": { "type": "string" }, + "pipelines": { + "items": { "$ref": "../pipeline.json" } + } } } } diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/package_with_build.json b/spec/fixtures/api/schemas/public_api/v4/packages/package_with_build.json index de3ef94138e..86b4e205c3e 100644 --- a/spec/fixtures/api/schemas/public_api/v4/packages/package_with_build.json +++ b/spec/fixtures/api/schemas/public_api/v4/packages/package_with_build.json @@ -5,6 +5,9 @@ "name": { "type": "string" }, "version": { "type": "string" }, "package_type": { "type": "string" }, - "pipeline": { "$ref": "../pipeline.json" } + "pipeline": { "$ref": "../pipeline.json" }, + "pipelines": { + "items": { "$ref": "../pipeline.json" } + } } } diff --git a/spec/fixtures/api/schemas/public_api/v4/release.json b/spec/fixtures/api/schemas/public_api/v4/release.json index 02e23d2732d..69ac383b7fd 100644 --- a/spec/fixtures/api/schemas/public_api/v4/release.json +++ b/spec/fixtures/api/schemas/public_api/v4/release.json @@ -21,7 +21,6 @@ }, "commit_path": { "type": "string" }, "tag_path": { "type": "string" }, - "name": { "type": "string" }, "evidences": { "type": "array", "items": { "$ref": "release/evidence.json" } @@ -42,11 +41,8 @@ "additionalProperties": false }, "_links": { - "required": ["merge_requests_url", "issues_url"], "properties": { - "merge_requests_url": { "type": "string" }, - "issues_url": { "type": "string" }, - "edit_url": { "type": "string"} + "edit_url": { "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 1a1e92ac778..058b7b4b4ed 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 @@ -26,11 +26,7 @@ "additionalProperties": false }, "_links": { - "required": ["merge_requests_url", "issues_url"], - "properties": { - "merge_requests_url": { "type": "string" }, - "issues_url": { "type": "string" } - } + "properties": {} } }, "additionalProperties": false |