diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 03:09:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 03:09:20 +0300 |
| commit | 72721699f11187199e89631ce0b5e3d2f7c167e9 (patch) | |
| tree | b51a227be89d82aa24fc954e7b50e7b0933583cc /spec/fixtures/lib | |
| parent | 06be418a7cd98a1c87c41ba43cca1ce9acbe885e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures/lib')
| -rw-r--r-- | spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json | 3 | ||||
| -rw-r--r-- | spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json index ac40f2dcd13..038f5ac5d4e 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json @@ -16,7 +16,8 @@ "label": { "type": "string" }, "track": { "type": "string" }, "prometheus_endpoint_path": { "type": "string" }, - "metric_id": { "type": "number" } + "metric_id": { "type": "number" }, + "edit_path": { "type": ["string", "null"] } }, "additionalProperties": false } diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json index f4afb4cbffc..d16fcd40359 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json @@ -10,7 +10,8 @@ "panels": { "type": "array", "items": { "$ref": "panels.json" } - } + }, + "has_custom_metrics": { "type": "boolean" } }, "additionalProperties": false } |