diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 09:08:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 09:08:10 +0000 |
| commit | 82fa8a3d1e8466ef36b58604d20fcc145ea12118 (patch) | |
| tree | c5c0286537405c2fa7719ecce3ed0d73d947c555 /spec/fixtures | |
| parent | 232655bf32cd474d54de357b65ef43d77271117c (diff) | |
| download | gitlab-ce-82fa8a3d1e8466ef36b58604d20fcc145ea12118.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
3 files changed, 15 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/deploy_token.json b/spec/fixtures/api/schemas/public_api/v4/deploy_token.json index c8a8b8d1e7d..7cb9f136b0d 100644 --- a/spec/fixtures/api/schemas/public_api/v4/deploy_token.json +++ b/spec/fixtures/api/schemas/public_api/v4/deploy_token.json @@ -25,7 +25,9 @@ "items": { "type": "string" } + }, + "token": { + "type": "string" } - }, - "additionalProperties": false + } }
\ No newline at end of file diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/axis.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/axis.json new file mode 100644 index 00000000000..ed8fa58393f --- /dev/null +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/axis.json @@ -0,0 +1,10 @@ +{ + "type": "object", + "required": [], + "properties": { + "name": { "type": "string" }, + "precision": { "type": "number" }, + "format": { "type": "string" } + }, + "additionalProperties": false +} diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json index a16f1ef592f..9f39e9c77cb 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json @@ -9,6 +9,7 @@ "title": { "type": "string" }, "type": { "type": "string" }, "y_label": { "type": "string" }, + "y_axis": { "$ref": "axis.json" }, "weight": { "type": "number" }, "metrics": { "type": "array", |