Add latest changes from gitlab-org/gitlab@master

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