diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /spec/fixtures/api | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
download | gitlab-ce-9dc93a4519d9d5d7be48ff274127136236a3adb3.tar.gz |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'spec/fixtures/api')
6 files changed, 84 insertions, 12 deletions
diff --git a/spec/fixtures/api/schemas/entities/member.json b/spec/fixtures/api/schemas/entities/member.json index 03b1872632e..f06687f9809 100644 --- a/spec/fixtures/api/schemas/entities/member.json +++ b/spec/fixtures/api/schemas/entities/member.json @@ -8,6 +8,7 @@ "requested_at", "source", "valid_roles", + "type", "can_update", "can_remove", "is_direct_member" @@ -40,6 +41,7 @@ "additionalProperties": false }, "valid_roles": { "type": "object" }, + "type": { "type": "string" }, "created_by": { "type": "object", "required": ["name", "web_url"], diff --git a/spec/fixtures/api/schemas/entities/member_user.json b/spec/fixtures/api/schemas/entities/member_user.json index ebd26bfaaaa..41a1e510de5 100644 --- a/spec/fixtures/api/schemas/entities/member_user.json +++ b/spec/fixtures/api/schemas/entities/member_user.json @@ -18,6 +18,5 @@ }, "additionalProperties": false } - }, - "additionalProperties": false + } } diff --git a/spec/fixtures/api/schemas/external_validation.json b/spec/fixtures/api/schemas/external_validation.json index 1bd00a2e6fc..3ff71626cc0 100644 --- a/spec/fixtures/api/schemas/external_validation.json +++ b/spec/fixtures/api/schemas/external_validation.json @@ -11,11 +11,13 @@ "type": "object", "required": [ "id", - "path" + "path", + "created_at" ], "properties": { "id": { "type": "integer" }, - "path": { "type": "string" } + "path": { "type": "string" }, + "created_at": { "type": ["string", "null"], "format": "date-time" } } }, "user": { @@ -23,12 +25,14 @@ "required": [ "id", "username", - "email" + "email", + "created_at" ], "properties": { "id": { "type": "integer" }, "username": { "type": "string" }, - "email": { "type": "string" } + "email": { "type": "string" }, + "created_at": { "type": ["string", "null"], "format": "date-time" } } }, "pipeline": { @@ -70,6 +74,5 @@ } } } - }, - "additionalProperties": false + } } diff --git a/spec/fixtures/api/schemas/graphql/packages/package_conan_metadata.json b/spec/fixtures/api/schemas/graphql/packages/package_conan_metadata.json new file mode 100644 index 00000000000..31bb861ced5 --- /dev/null +++ b/spec/fixtures/api/schemas/graphql/packages/package_conan_metadata.json @@ -0,0 +1,37 @@ +{ + "type": "object", + "additionalProperties": false, + "required": [ + "id", + "createdAt", + "updatedAt", + "packageUsername", + "packageChannel", + "recipe", + "recipePath", + "packageName" + ], + "properties": { + "id": { + "type": "string" + }, + "created_at": { + "type": "string" + }, + "updated_at": { + "type": "string" + }, + "package_username": { + "type": "string" + }, + "package_channel": { + "type": "string" + }, + "recipe": { + "type": "string" + }, + "recipe_path": { + "type": "string" + } + } +} diff --git a/spec/fixtures/api/schemas/graphql/packages/package_details.json b/spec/fixtures/api/schemas/graphql/packages/package_details.json index d2e2e65db54..87b173eefc7 100644 --- a/spec/fixtures/api/schemas/graphql/packages/package_details.json +++ b/spec/fixtures/api/schemas/graphql/packages/package_details.json @@ -2,8 +2,17 @@ "type": "object", "additionalProperties": false, "required": [ - "id", "name", "createdAt", "updatedAt", "version", "packageType", - "project", "tags", "pipelines", "versions", "metadata" + "id", + "name", + "createdAt", + "updatedAt", + "version", + "packageType", + "project", + "tags", + "pipelines", + "versions", + "metadata" ], "properties": { "id": { @@ -23,7 +32,18 @@ }, "packageType": { "type": ["string"], - "enum": ["MAVEN", "NPM", "CONAN", "NUGET", "PYPI", "COMPOSER", "GENERIC", "GOLANG", "DEBIAN"] + "enum": [ + "MAVEN", + "NPM", + "CONAN", + "NUGET", + "PYPI", + "COMPOSER", + "GENERIC", + "GOLANG", + "RUBYGEMS", + "DEBIAN" + ] }, "tags": { "type": "object", @@ -59,8 +79,18 @@ "metadata": { "anyOf": [ { "$ref": "./package_composer_metadata.json" }, + { "$ref": "./package_conan_metadata.json" }, { "type": "null" } ] + }, + "packageFiles": { + "type": "object", + "additionalProperties": false, + "properties": { + "pageInfo": { "type": "object" }, + "edges": { "type": "array" }, + "nodes": { "type": "array" } + } } } } diff --git a/spec/fixtures/api/schemas/public_api/v4/user/public.json b/spec/fixtures/api/schemas/public_api/v4/user/public.json index faa126b65f2..ee848eda9ed 100644 --- a/spec/fixtures/api/schemas/public_api/v4/user/public.json +++ b/spec/fixtures/api/schemas/public_api/v4/user/public.json @@ -70,6 +70,7 @@ "can_create_group": { "type": "boolean" }, "can_create_project": { "type": "boolean" }, "two_factor_enabled": { "type": "boolean" }, - "external": { "type": "boolean" } + "external": { "type": "boolean" }, + "commit_email": { "type": "string" } } } |