summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-09-11 13:21:38 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-09-11 13:21:38 +0000
commit68e8bbdb54f81847379659cbaad3ae9478684e24 (patch)
tree34edf07cfc6d2bbff2707d959f20226b0f00cb18 /spec/fixtures
parent3c282a88aa25129c15d219351852e1ea1f2b22b6 (diff)
parent5374f423204386a4c3e6ab887214de58c0113d75 (diff)
downloadgitlab-ce-68e8bbdb54f81847379659cbaad3ae9478684e24.tar.gz
Merge branch '61927-pages-custom-domain-virtual-domain' into 'master'
Add support for custom domains to the Pages internal API See merge request gitlab-org/gitlab-ce!32735
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/internal/pages/lookup_path.json25
-rw-r--r--spec/fixtures/api/schemas/internal/pages/virtual_domain.json16
2 files changed, 41 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/internal/pages/lookup_path.json b/spec/fixtures/api/schemas/internal/pages/lookup_path.json
new file mode 100644
index 00000000000..b2b3d3f9d0a
--- /dev/null
+++ b/spec/fixtures/api/schemas/internal/pages/lookup_path.json
@@ -0,0 +1,25 @@
+{
+ "type": "object",
+ "required": [
+ "project_id",
+ "https_only",
+ "access_control",
+ "source",
+ "prefix"
+ ],
+ "properties": {
+ "project_id": { "type": "integer" },
+ "https_only": { "type": "boolean" },
+ "access_control": { "type": "boolean" },
+ "source": { "type": "object",
+ "required": ["type", "path"],
+ "properties" : {
+ "type": { "type": "string", "enum": ["file"] },
+ "path": { "type": "string" }
+ },
+ "additionalProperties": false
+ },
+ "prefix": { "type": "string" }
+ },
+ "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/internal/pages/virtual_domain.json b/spec/fixtures/api/schemas/internal/pages/virtual_domain.json
new file mode 100644
index 00000000000..02df69026b0
--- /dev/null
+++ b/spec/fixtures/api/schemas/internal/pages/virtual_domain.json
@@ -0,0 +1,16 @@
+{
+ "type": "object",
+ "required": [
+ "lookup_paths"
+ ],
+ "optional": [
+ "certificate",
+ "key"
+ ],
+ "properties": {
+ "certificate": { "type": ["string", "null"] },
+ "key": { "type": ["string", "null"] },
+ "lookup_paths": { "type": "array", "items": { "$ref": "lookup_path.json" } }
+ },
+ "additionalProperties": false
+}