Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

5 files changed, 40 insertions, 8 deletions

diff --git a/spec/fixtures/api/schemas/analytics/cycle_analytics/summary.json b/spec/fixtures/api/schemas/analytics/cycle_analytics/summary.json
index 73904438ede..296e18fca47 100644
--- a/spec/fixtures/api/schemas/analytics/cycle_analytics/summary.json
+++ b/spec/fixtures/api/schemas/analytics/cycle_analytics/summary.json
@@ -14,6 +14,9 @@
       },
       "unit": {
         "type": "string"
+      },
+      "links": {
+        "type": "array"
       }
     },
     "additionalProperties": false
diff --git a/spec/fixtures/api/schemas/graphql/packages/package_details.json b/spec/fixtures/api/schemas/graphql/packages/package_details.json
index 2824ca64325..9ef7f6c9271 100644
--- a/spec/fixtures/api/schemas/graphql/packages/package_details.json
+++ b/spec/fixtures/api/schemas/graphql/packages/package_details.json
@@ -12,7 +12,6 @@
     "tags",
     "pipelines",
     "versions",
-    "metadata",
     "status",
     "canDestroy"
   ],
@@ -47,7 +46,8 @@
         "GENERIC",
         "GOLANG",
         "RUBYGEMS",
-        "DEBIAN"
+        "DEBIAN",
+        "HELM"
       ]
     },
     "tags": {
diff --git a/spec/fixtures/api/schemas/public_api/v4/deploy_key.json b/spec/fixtures/api/schemas/public_api/v4/deploy_key.json
new file mode 100644
index 00000000000..3dbdfcc95a1
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/deploy_key.json
@@ -0,0 +1,25 @@
+{
+  "type": "object",
+  "required": [
+    "id",
+    "title",
+    "created_at",
+    "expires_at",
+    "key",
+    "fingerprint",
+    "projects_with_write_access"
+  ],
+  "properties": {
+    "id": { "type": "integer" },
+    "title": { "type": "string" },
+    "created_at": { "type": "string", "format": "date-time" },
+    "expires_at": { "type": ["string", "null"], "format": "date-time" },
+    "key": { "type": "string" },
+    "fingerprint": { "type": "string" },
+    "projects_with_write_access": {
+      "type": "array",
+      "items": { "$ref": "project/identity.json" }
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/deploy_keys.json b/spec/fixtures/api/schemas/public_api/v4/deploy_keys.json
new file mode 100644
index 00000000000..82ddbdddbee
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/deploy_keys.json
@@ -0,0 +1,4 @@
+{
+  "type": "array",
+  "items": { "$ref": "deploy_key.json" }
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/npm_package_version.json b/spec/fixtures/api/schemas/public_api/v4/packages/npm_package_version.json
index 3e74dc0a1c2..64969d71250 100644
--- a/spec/fixtures/api/schemas/public_api/v4/packages/npm_package_version.json
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/npm_package_version.json
@@ -36,11 +36,11 @@
         ".{1,}": { "type": "string" }
       }
     },
-    "deprecated": {
-      "type": "object",
-      "patternProperties": {
-        ".{1,}": { "type": "string" }
-      }
-    }
+    "deprecated": { "type": "string"},
+    "bin": { "type": "string" },
+    "directories": { "type": "array" },
+    "engines": { "type": "object" },
+    "_hasShrinkwrap": { "type": "boolean" },
+    "additionalProperties": true
   }
 }