summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-07 12:09:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-07 12:09:34 +0000
commit903ccf7c93eb9490c76857bffe744249cc07de09 (patch)
tree603a3162e91999160e4efc74f351f9405f422d61 /spec/fixtures
parent41cb558299b483b44b45351730ee4c0e9fe4ca2c (diff)
downloadgitlab-ce-903ccf7c93eb9490c76857bffe744249cc07de09.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/prometheus/metrics.json28
-rw-r--r--spec/fixtures/api/schemas/registry/repository.json6
2 files changed, 34 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/prometheus/metrics.json b/spec/fixtures/api/schemas/prometheus/metrics.json
new file mode 100644
index 00000000000..0a13f5efc77
--- /dev/null
+++ b/spec/fixtures/api/schemas/prometheus/metrics.json
@@ -0,0 +1,28 @@
+{
+ "type": "object",
+ "properties": {
+ "metrics": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "title": {
+ "type": "string"
+ },
+ "group": {
+ "type": "string"
+ },
+ "group_title": {
+ "type": "string"
+ },
+ "edit_path": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/spec/fixtures/api/schemas/registry/repository.json b/spec/fixtures/api/schemas/registry/repository.json
index d0a068b65a7..f7469aad235 100644
--- a/spec/fixtures/api/schemas/registry/repository.json
+++ b/spec/fixtures/api/schemas/registry/repository.json
@@ -32,6 +32,12 @@
"destroy_path": {
"type": "string"
},
+ "status": {
+ "oneOf": [
+ { "type": "null" },
+ { "type": "string", "enum": ["delete_scheduled", "delete_failed"] }
+ ]
+ },
"tags": { "$ref": "tags.json" }
},
"additionalProperties": false