diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 09:09:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 09:09:23 +0000 |
| commit | 6fa3630aad333511c687b385c2333e98e09595b4 (patch) | |
| tree | 137531fbfbf7b47316b90931ec858e82128d698d /spec/fixtures | |
| parent | d49d44c81043c2830ef80df5fa3f1eee77a13f52 (diff) | |
| download | gitlab-ce-6fa3630aad333511c687b385c2333e98e09595b4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
3 files changed, 19 insertions, 32 deletions
diff --git a/spec/fixtures/api/schemas/graphql/container_repositories.json b/spec/fixtures/api/schemas/graphql/container_repositories.json new file mode 100644 index 00000000000..8e8982ff8c7 --- /dev/null +++ b/spec/fixtures/api/schemas/graphql/container_repositories.json @@ -0,0 +1,12 @@ +{ + "type": "array", + "items": { + "type": "object", + "required": ["node"], + "properties": { + "node": { + "$ref": "./container_repository.json" + } + } + } +} diff --git a/spec/fixtures/api/schemas/graphql/container_repository.json b/spec/fixtures/api/schemas/graphql/container_repository.json index 0737e71dd17..e252bedab82 100644 --- a/spec/fixtures/api/schemas/graphql/container_repository.json +++ b/spec/fixtures/api/schemas/graphql/container_repository.json @@ -1,6 +1,6 @@ { "type": "object", - "required": ["id", "name", "path", "location", "createdAt", "updatedAt", "tagsCount", "canDelete"], + "required": ["id", "name", "path", "location", "createdAt", "updatedAt", "tagsCount", "canDelete", "expirationPolicyCleanupStatus"], "properties": { "id": { "type": "string" @@ -31,6 +31,10 @@ }, "canDelete": { "type": "boolean" + }, + "expirationPolicyCleanupStatus": { + "type": "string", + "enum": ["UNSCHEDULED", "SCHEDULED", "UNFINISHED", "ONGOING"] } } } diff --git a/spec/fixtures/api/schemas/graphql/container_repository_details.json b/spec/fixtures/api/schemas/graphql/container_repository_details.json index b076711dcea..3db91796fc6 100644 --- a/spec/fixtures/api/schemas/graphql/container_repository_details.json +++ b/spec/fixtures/api/schemas/graphql/container_repository_details.json @@ -1,37 +1,8 @@ { "type": "object", - "required": ["id", "name", "path", "location", "createdAt", "updatedAt", "tagsCount", "canDelete", "tags"], + "required": ["tags"], + "allOf": [{ "$ref": "./container_repository.json" }], "properties": { - "id": { - "type": "string" - }, - "name": { - "type": "string" - }, - "path": { - "type": "string" - }, - "location": { - "type": "string" - }, - "createdAt": { - "type": "string" - }, - "updatedAt": { - "type": "string" - }, - "expirationPolicyStartedAt": { - "type": ["string", "null"] - }, - "status": { - "type": ["string", "null"] - }, - "tagsCount": { - "type": "integer" - }, - "canDelete": { - "type": "boolean" - }, "tags": { "type": "object", "required": ["nodes"], |