diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/fixtures/api/schemas | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/fixtures/api/schemas')
9 files changed, 51 insertions, 9 deletions
diff --git a/spec/fixtures/api/schemas/analytics/cycle_analytics/summary.json b/spec/fixtures/api/schemas/analytics/cycle_analytics/summary.json new file mode 100644 index 00000000000..73904438ede --- /dev/null +++ b/spec/fixtures/api/schemas/analytics/cycle_analytics/summary.json @@ -0,0 +1,21 @@ +{ + "type": "array", + "items": { + "minItems": 2, + "maxItems": 3, + "type": "object", + "required": ["value", "title"], + "properties": { + "value": { + "type": "string" + }, + "title": { + "type": "string" + }, + "unit": { + "type": "string" + } + }, + "additionalProperties": false + } +} diff --git a/spec/fixtures/api/schemas/cluster_status.json b/spec/fixtures/api/schemas/cluster_status.json index f6db336fe65..ce62655648b 100644 --- a/spec/fixtures/api/schemas/cluster_status.json +++ b/spec/fixtures/api/schemas/cluster_status.json @@ -42,8 +42,6 @@ "host": {"type": ["string", "null"]}, "port": {"type": ["integer", "514"]}, "protocol": {"type": ["integer", "0"]}, - "waf_log_enabled": {"type": ["boolean", "true"]}, - "cilium_log_enabled": {"type": ["boolean", "true"]}, "update_available": { "type": ["boolean", "null"] }, "can_uninstall": { "type": "boolean" }, "available_domains": { diff --git a/spec/fixtures/api/schemas/entities/issue_board.json b/spec/fixtures/api/schemas/entities/issue_board.json index 56298cb124d..58d3832440c 100644 --- a/spec/fixtures/api/schemas/entities/issue_board.json +++ b/spec/fixtures/api/schemas/entities/issue_board.json @@ -18,7 +18,8 @@ "type": "object", "properties": { "id": { "type": "integer" }, - "path": { "type": "string" } + "path": { "type": "string" }, + "path_with_namespace": { "type": "string" } } }, "milestone": { diff --git a/spec/fixtures/api/schemas/external_validation.json b/spec/fixtures/api/schemas/external_validation.json index 3ff71626cc0..280b77b221a 100644 --- a/spec/fixtures/api/schemas/external_validation.json +++ b/spec/fixtures/api/schemas/external_validation.json @@ -32,7 +32,9 @@ "id": { "type": "integer" }, "username": { "type": "string" }, "email": { "type": "string" }, - "created_at": { "type": ["string", "null"], "format": "date-time" } + "created_at": { "type": ["string", "null"], "format": "date-time" }, + "current_sign_in_ip": { "type": ["string", "null"] }, + "last_sign_in_ip": { "type": ["string", "null"] } } }, "pipeline": { diff --git a/spec/fixtures/api/schemas/graphql/packages/package_details.json b/spec/fixtures/api/schemas/graphql/packages/package_details.json index ca08e005e9d..3dfe6712b75 100644 --- a/spec/fixtures/api/schemas/graphql/packages/package_details.json +++ b/spec/fixtures/api/schemas/graphql/packages/package_details.json @@ -83,6 +83,7 @@ { "$ref": "./package_conan_metadata.json" }, { "$ref": "./package_maven_metadata.json" }, { "$ref": "./package_nuget_metadata.json" }, + { "$ref": "./package_pypi_metadata.json" }, { "type": "null" } ] }, diff --git a/spec/fixtures/api/schemas/graphql/packages/package_pypi_metadata.json b/spec/fixtures/api/schemas/graphql/packages/package_pypi_metadata.json new file mode 100644 index 00000000000..cecebe3a0e9 --- /dev/null +++ b/spec/fixtures/api/schemas/graphql/packages/package_pypi_metadata.json @@ -0,0 +1,13 @@ +{ + "type": "object", + "additionalProperties": false, + "required": ["id"], + "properties": { + "id": { + "type": "string" + }, + "requiredPython": { + "type": "string" + } + } +} diff --git a/spec/fixtures/api/schemas/public_api/v4/board.json b/spec/fixtures/api/schemas/public_api/v4/board.json index c3a140c1bd7..11dfa131e88 100644 --- a/spec/fixtures/api/schemas/public_api/v4/board.json +++ b/spec/fixtures/api/schemas/public_api/v4/board.json @@ -15,6 +15,7 @@ "description", "default_branch", "tag_list", + "topics", "ssh_url_to_repo", "http_url_to_repo", "web_url", @@ -34,6 +35,7 @@ "description": { "type": ["string", "null"] }, "default_branch": { "type": ["string", "null"] }, "tag_list": { "type": "array" }, + "topics": { "type": "array" }, "ssh_url_to_repo": { "type": "string" }, "http_url_to_repo": { "type": "string" }, "web_url": { "type": "string" }, diff --git a/spec/fixtures/api/schemas/public_api/v4/label_basic.json b/spec/fixtures/api/schemas/public_api/v4/label_basic.json index a4653c67ed2..a501bc2ec56 100644 --- a/spec/fixtures/api/schemas/public_api/v4/label_basic.json +++ b/spec/fixtures/api/schemas/public_api/v4/label_basic.json @@ -6,8 +6,7 @@ "color", "description", "description_html", - "text_color", - "remove_on_close" + "text_color" ], "properties": { "id": { "type": "integer" }, @@ -21,8 +20,7 @@ "text_color": { "type": "string", "pattern": "^#[0-9A-Fa-f]{3}{1,2}$" - }, - "remove_on_close": { "type": "boolean" } + } }, "additionalProperties": false } diff --git a/spec/fixtures/api/schemas/public_api/v4/project.json b/spec/fixtures/api/schemas/public_api/v4/project.json index 4a3149f2bdc..2f708538d96 100644 --- a/spec/fixtures/api/schemas/public_api/v4/project.json +++ b/spec/fixtures/api/schemas/public_api/v4/project.json @@ -15,6 +15,12 @@ "type": "string" } }, + "topics": { + "type": "array", + "items": { + "type": "string" + } + }, "ssh_url_to_repo": { "type": "string" }, "http_url_to_repo": { "type": "string" }, "web_url": { "type": "string" }, @@ -37,7 +43,7 @@ }, "required": [ "id", "name", "name_with_namespace", "description", "path", - "path_with_namespace", "created_at", "default_branch", "tag_list", + "path_with_namespace", "created_at", "default_branch", "tag_list", "topics", "ssh_url_to_repo", "http_url_to_repo", "web_url", "readme_url", "avatar_url", "star_count", "forks_count", "last_activity_at", "namespace" ], |