diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-02-21 00:05:31 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-02-21 00:12:46 +0300 |
| commit | 456f24a00e5c55518a9930fd414c4ec6d829fe0d (patch) | |
| tree | 9c74ba7eda466eb709d7ee529405db53a31c88e7 /spec/fixtures | |
| parent | b4503e64810826f06be25b4f17ac793e8e8e4f58 (diff) | |
Merge branch '29497-pages-custom-domain-dns-verification' into 'security-10-5'
Add DNS verification to Pages custom domains (GitLab 10.5)
See merge request gitlab/gitlabhq!2322
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json | 5 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json b/spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json index e8c17298b43..ed8ed9085c0 100644 --- a/spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json +++ b/spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json @@ -4,6 +4,9 @@ "domain": { "type": "string" }, "url": { "type": "uri" }, "project_id": { "type": "integer" }, + "verified": { "type": "boolean" }, + "verification_code": { "type": ["string", "null"] }, + "enabled_until": { "type": ["date", "null"] }, "certificate_expiration": { "type": "object", "properties": { @@ -14,6 +17,6 @@ "additionalProperties": false } }, - "required": ["domain", "url", "project_id"], + "required": ["domain", "url", "project_id", "verified", "verification_code", "enabled_until"], "additionalProperties": false } diff --git a/spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json b/spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json index 08db8d47050..b57d544f896 100644 --- a/spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json +++ b/spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json @@ -3,6 +3,9 @@ "properties": { "domain": { "type": "string" }, "url": { "type": "uri" }, + "verified": { "type": "boolean" }, + "verification_code": { "type": ["string", "null"] }, + "enabled_until": { "type": ["date", "null"] }, "certificate": { "type": "object", "properties": { @@ -15,6 +18,6 @@ "additionalProperties": false } }, - "required": ["domain", "url"], + "required": ["domain", "url", "verified", "verification_code", "enabled_until"], "additionalProperties": false } |