diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /spec/fixtures/api/schemas | |
parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'spec/fixtures/api/schemas')
-rw-r--r-- | spec/fixtures/api/schemas/deployment.json | 3 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/environment.json | 2 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/list.json | 2 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/deploy_token.json | 10 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/system_hook.json | 24 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/system_hooks.json | 9 |
6 files changed, 46 insertions, 4 deletions
diff --git a/spec/fixtures/api/schemas/deployment.json b/spec/fixtures/api/schemas/deployment.json index fa34a61c7d3..7d96147314c 100644 --- a/spec/fixtures/api/schemas/deployment.json +++ b/spec/fixtures/api/schemas/deployment.json @@ -64,6 +64,5 @@ "items": { "$ref": "job/job.json" } }, "status": { "type": "string" } - }, - "additionalProperties": false + } } diff --git a/spec/fixtures/api/schemas/environment.json b/spec/fixtures/api/schemas/environment.json index 4f54a77e6b2..87b6e5da370 100644 --- a/spec/fixtures/api/schemas/environment.json +++ b/spec/fixtures/api/schemas/environment.json @@ -35,6 +35,8 @@ "auto_stop_at": { "type": "string", "format": "date-time" }, "can_stop": { "type": "boolean" }, "has_opened_alert": { "type": "boolean" }, + "tier": { "type": "string" }, + "required_approval_count": { "type": "integer" }, "cluster_type": { "type": "types/nullable_string.json" }, "terminal_path": { "type": "types/nullable_string.json" }, "rollout_status": { diff --git a/spec/fixtures/api/schemas/list.json b/spec/fixtures/api/schemas/list.json index 65e140f9e28..0985874a500 100644 --- a/spec/fixtures/api/schemas/list.json +++ b/spec/fixtures/api/schemas/list.json @@ -34,7 +34,7 @@ "priority": { "type": ["integer", "null"] } } }, - "title": { "type": "string" }, + "title": { "type": ["string", "null"] }, "position": { "type": ["integer", "null"] }, "max_issue_count": { "type": "integer" }, "max_issue_weight": { "type": "integer" }, diff --git a/spec/fixtures/api/schemas/public_api/v4/deploy_token.json b/spec/fixtures/api/schemas/public_api/v4/deploy_token.json index c4d3f944aea..102ab95a4ee 100644 --- a/spec/fixtures/api/schemas/public_api/v4/deploy_token.json +++ b/spec/fixtures/api/schemas/public_api/v4/deploy_token.json @@ -5,7 +5,9 @@ "name", "username", "expires_at", - "scopes" + "scopes", + "revoked", + "expired" ], "properties": { "id": { @@ -26,6 +28,12 @@ }, "token": { "type": "string" + }, + "revoked": { + "type": "boolean" + }, + "expired": { + "type": "boolean" } } }
\ No newline at end of file diff --git a/spec/fixtures/api/schemas/public_api/v4/system_hook.json b/spec/fixtures/api/schemas/public_api/v4/system_hook.json new file mode 100644 index 00000000000..f992bc8b809 --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/system_hook.json @@ -0,0 +1,24 @@ +{ + "type": "object", + "required": [ + "id", + "url", + "created_at", + "push_events", + "tag_push_events", + "merge_requests_events", + "repository_update_events", + "enable_ssl_verification" + ], + "properties": { + "id": { "type": "integer" }, + "url": { "type": "string" }, + "created_at": { "type": "string" }, + "push_events": { "type": "boolean" }, + "tag_push_events": { "type": "boolean" }, + "merge_requests_events": { "type": "boolean" }, + "repository_update_events": { "type": "boolean" }, + "enable_ssl_verification": { "type": "boolean" } + }, + "additionalProperties": false +} diff --git a/spec/fixtures/api/schemas/public_api/v4/system_hooks.json b/spec/fixtures/api/schemas/public_api/v4/system_hooks.json new file mode 100644 index 00000000000..a56542a8b99 --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/system_hooks.json @@ -0,0 +1,9 @@ +{ + "type": "array", + "items": { + "type": "object", + "properties" : { + "$ref": "./system_hook.json" + } + } +} |