diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 18:09:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 18:09:24 +0300 |
| commit | f8d15ca65390475e356b06dedc51e10ccd179f86 (patch) | |
| tree | ef916d4e8e11c9e00d809e5cdcf63814e86d6e89 /spec/fixtures/api | |
| parent | 3ab4feda4dce9c9f0672375ae27c2f7c2ba6f4ad (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures/api')
| -rw-r--r-- | spec/fixtures/api/schemas/cluster_status.json | 10 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/release/link.json | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/cluster_status.json b/spec/fixtures/api/schemas/cluster_status.json index 29c56b5c820..6017ca9e2d5 100644 --- a/spec/fixtures/api/schemas/cluster_status.json +++ b/spec/fixtures/api/schemas/cluster_status.json @@ -39,9 +39,15 @@ "stack": { "type": ["string", "null"] }, "modsecurity_enabled": { "type": ["boolean", "null"] }, "update_available": { "type": ["boolean", "null"] }, - "can_uninstall": { "type": "boolean" } + "can_uninstall": { "type": "boolean" }, + "available_domains": { + "type": "array", + "items": { "$ref": "#/definitions/domain" } + }, + "pages_domain": { "type": [ { "$ref": "#/definitions/domain" }, "null"] } }, "required" : [ "name", "status" ] - } + }, + "domain": { "id": "integer", "domain": "string" } } } diff --git a/spec/fixtures/api/schemas/release/link.json b/spec/fixtures/api/schemas/release/link.json index 97347cb91cc..bf175be2bc0 100644 --- a/spec/fixtures/api/schemas/release/link.json +++ b/spec/fixtures/api/schemas/release/link.json @@ -4,7 +4,9 @@ "properties": { "id": { "type": "integer" }, "name": { "type": "string" }, + "filepath": { "type": "string" }, "url": { "type": "string" }, + "direct_asset_url": { "type": "string" }, "external": { "type": "boolean" } }, "additionalProperties": false |