Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-14 15:10:13 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-14 15:10:13 +0300
commitb82c4935ecc86d1429710163287f5bd7d75bf226 (patch)
tree804f3e490810b4e4c6b9bbe1c9aeadaf3ca7de32 /spec/fixtures
parent0e0ec3ddd5528b1d2114606158344226debabdc9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/analytics/cycle_analytics/summary.json21
-rw-r--r--spec/fixtures/api/schemas/cluster_status.json1
2 files changed, 21 insertions, 1 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..c919cd54a28 100644
--- a/spec/fixtures/api/schemas/cluster_status.json
+++ b/spec/fixtures/api/schemas/cluster_status.json
@@ -42,7 +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" },