Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

4 files changed, 61 insertions, 8 deletions

diff --git a/spec/fixtures/api/schemas/graphql/packages/package_conan_metadata.json b/spec/fixtures/api/schemas/graphql/packages/package_conan_metadata.json
index 31bb861ced5..acfef595b08 100644
--- a/spec/fixtures/api/schemas/graphql/packages/package_conan_metadata.json
+++ b/spec/fixtures/api/schemas/graphql/packages/package_conan_metadata.json
@@ -8,29 +8,28 @@
     "packageUsername",
     "packageChannel",
     "recipe",
-    "recipePath",
-    "packageName"
+    "recipePath"
   ],
   "properties": {
     "id": {
       "type": "string"
     },
-    "created_at": {
+    "createdAt": {
       "type": "string"
     },
-    "updated_at": {
+    "updatedAt": {
       "type": "string"
     },
-    "package_username": {
+    "packageUsername": {
       "type": "string"
     },
-    "package_channel": {
+    "packageChannel": {
       "type": "string"
     },
     "recipe": {
       "type": "string"
     },
-    "recipe_path": {
+    "recipePath": {
       "type": "string"
     }
   }
diff --git a/spec/fixtures/api/schemas/graphql/packages/package_details.json b/spec/fixtures/api/schemas/graphql/packages/package_details.json
index 87b173eefc7..ca08e005e9d 100644
--- a/spec/fixtures/api/schemas/graphql/packages/package_details.json
+++ b/spec/fixtures/api/schemas/graphql/packages/package_details.json
@@ -12,7 +12,8 @@
     "tags",
     "pipelines",
     "versions",
-    "metadata"
+    "metadata",
+    "status"
   ],
   "properties": {
     "id": {
@@ -80,6 +81,8 @@
       "anyOf": [
         { "$ref": "./package_composer_metadata.json" },
         { "$ref": "./package_conan_metadata.json" },
+        { "$ref": "./package_maven_metadata.json" },
+        { "$ref": "./package_nuget_metadata.json" },
         { "type": "null" }
       ]
     },
@@ -91,6 +94,10 @@
         "edges": { "type": "array" },
         "nodes": { "type": "array" }
       }
+    },
+    "status": {
+      "type": ["string"],
+      "enum": ["DEFAULT", "HIDDEN", "PROCESSING", "ERROR"]
     }
   }
 }
diff --git a/spec/fixtures/api/schemas/graphql/packages/package_maven_metadata.json b/spec/fixtures/api/schemas/graphql/packages/package_maven_metadata.json
new file mode 100644
index 00000000000..64d482b2551
--- /dev/null
+++ b/spec/fixtures/api/schemas/graphql/packages/package_maven_metadata.json
@@ -0,0 +1,28 @@
+{
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["id", "createdAt", "updatedAt", "path", "appGroup", "appName"],
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "createdAt": {
+      "type": "string"
+    },
+    "updatedAt": {
+      "type": "string"
+    },
+    "path": {
+      "type": "string"
+    },
+    "appGroup": {
+      "type": "string"
+    },
+    "appVersion": {
+      "type": ["string", "null"]
+    },
+    "appName": {
+      "type": "string"
+    }
+  }
+}
diff --git a/spec/fixtures/api/schemas/graphql/packages/package_nuget_metadata.json b/spec/fixtures/api/schemas/graphql/packages/package_nuget_metadata.json
new file mode 100644
index 00000000000..131b9e97287
--- /dev/null
+++ b/spec/fixtures/api/schemas/graphql/packages/package_nuget_metadata.json
@@ -0,0 +1,19 @@
+{
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["id", "licenseUrl", "projectUrl", "iconUrl"],
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "licenseUrl": {
+      "type": "string"
+    },
+    "projectUrl": {
+      "type": "string"
+    },
+    "iconUrl": {
+      "type": "string"
+    }
+  }
+}