Add latest changes from gitlab-org/gitlab@master

3 files changed, 198 insertions, 57 deletions

diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/package_metadata.json b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/package_metadata.json
index 1244cbe474e..9c80f1621ad 100644
--- a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/package_metadata.json
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/package_metadata.json
@@ -1,26 +1,67 @@
 {
   "type": "object",
-  "required": ["@id", "packageContent", "catalogEntry"],
+  "required": [
+    "@id",
+    "packageContent",
+    "catalogEntry"
+  ],
   "properties": {
-    "@id": { "type": "string" },
-    "packageContent": { "type": "string" },
+    "@id": {
+      "type": "string"
+    },
+    "packageContent": {
+      "type": "string"
+    },
     "catalogEntry": {
       "type": "object",
-      "required": ["@id", "authors", "dependencyGroups", "id", "packageContent", "summary", "version"],
+      "required": [
+        "@id",
+        "authors",
+        "dependencyGroups",
+        "id",
+        "packageContent",
+        "summary",
+        "version"
+      ],
       "properties": {
-        "@id": { "type": "string" },
-        "authors": { "const": "" },
-        "id": { "type": "string" },
-        "packageContent": { "type": "string" },
-        "summary": { "const": "" },
-        "tags": { "type": "string" },
-        "projectUrl": { "type": "string" },
-        "licenseUrl": { "type": "string" },
-        "iconUrl": { "type": "string" },
-        "version": { "type": "string" },
+        "@id": {
+          "type": "string"
+        },
+        "authors": {
+          "type": "string"
+        },
+        "id": {
+          "type": "string"
+        },
+        "packageContent": {
+          "type": "string"
+        },
+        "summary": {
+          "type": "string"
+        },
+        "tags": {
+          "type": "string"
+        },
+        "projectUrl": {
+          "type": "string"
+        },
+        "licenseUrl": {
+          "type": "string"
+        },
+        "iconUrl": {
+          "type": "string"
+        },
+        "version": {
+          "type": "string"
+        },
+        "published": {
+          "type": "string"
+        },
         "dependencyGroups": {
           "type": "array",
-          "items": { "$ref": "./dependency_group.json" }
+          "items": {
+            "$ref": "./dependency_group.json"
+          }
         }
       }
     }
diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json
index 0fa59bc3bec..94b5ad48a1e 100644
--- a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json
@@ -1,41 +1,96 @@
 {
   "type": "object",
-  "required": ["count", "items"],
+  "required": [
+    "count",
+    "items"
+  ],
   "properties": {
     "items": {
       "type": "array",
       "items": {
         "type": "object",
-        "required": ["lower", "upper", "count", "items"],
+        "required": [
+          "lower",
+          "upper",
+          "count",
+          "items"
+        ],
         "properties": {
-          "lower": { "type": "string" },
-          "upper": { "type": "string" },
-          "count": { "type": "integer" },
+          "lower": {
+            "type": "string"
+          },
+          "upper": {
+            "type": "string"
+          },
+          "count": {
+            "type": "integer"
+          },
           "items": {
             "type": "array",
             "items": {
               "type": "object",
-              "required": ["@id", "packageContent", "catalogEntry"],
+              "required": [
+                "@id",
+                "packageContent",
+                "catalogEntry"
+              ],
               "properties": {
-                "@id": { "type": "string" },
-                "packageContent": { "type": "string" },
+                "@id": {
+                  "type": "string"
+                },
+                "packageContent": {
+                  "type": "string"
+                },
                 "catalogEntry": {
                   "type": "object",
-                  "required": ["@id", "authors", "dependencyGroups", "id", "packageContent", "summary", "version"],
+                  "required": [
+                    "@id",
+                    "authors",
+                    "dependencyGroups",
+                    "id",
+                    "packageContent",
+                    "summary",
+                    "version"
+                  ],
                   "properties": {
-                    "@id": { "type": "string" },
-                    "authors": { "const": "" },
-                    "id": { "type": "string" },
-                    "packageContent": { "type": "string" },
-                    "summary": { "const": "" },
-                    "tags": { "type": "string" },
-                    "projectUrl": { "type": "string" },
-                    "licenseUrl": { "type": "string" },
-                    "iconUrl": { "type": "string" },
-                    "version": { "type": "string" },
+                    "@id": {
+                      "type": "string"
+                    },
+                    "authors": {
+                      "type": "string"
+                    },
+                    "id": {
+                      "type": "string"
+                    },
+                    "packageContent": {
+                      "type": "string"
+                    },
+                    "summary": {
+                      "type": "string"
+                    },
+                    "tags": {
+                      "type": "string"
+                    },
+                    "projectUrl": {
+                      "type": "string"
+                    },
+                    "licenseUrl": {
+                      "type": "string"
+                    },
+                    "iconUrl": {
+                      "type": "string"
+                    },
+                    "version": {
+                      "type": "string"
+                    },
+                    "published": {
+                      "type": "string"
+                    },
                     "dependencyGroups": {
                       "type": "array",
-                      "items": { "$ref": "./dependency_group.json" }
+                      "items": {
+                        "$ref": "./dependency_group.json"
+                      }
                     }
                   }
                 }
@@ -47,7 +102,3 @@
     }
   }
 }
-
-
-
-
diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/search.json b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/search.json
index 73d0927e24c..41ad7379d73 100644
--- a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/search.json
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/search.json
@@ -1,34 +1,83 @@
 {
   "type": "object",
-  "required": ["totalHits", "data"],
+  "required": [
+    "totalHits",
+    "data"
+  ],
   "properties": {
-    "totalHits": { "type": "integer" },
+    "totalHits": {
+      "type": "integer"
+    },
     "data": {
       "type": "array",
       "items": {
         "type": "object",
-        "required": ["@type", "authors", "id", "summary", "title", "totalDownloads", "verified", "versions"],
+        "required": [
+          "@type",
+          "authors",
+          "id",
+          "summary",
+          "title",
+          "totalDownloads",
+          "verified",
+          "versions"
+        ],
         "properties": {
-          "@type": { "const": "Package" },
-          "authors": { "const": "" },
-          "id": { "type": "string" },
-          "summary": { "const": "" },
-          "title": { "type": "string" },
-          "totalDownloads": { "const": 0 },
-          "verified": { "const": true },
-          "tags": { "type": "string" },
-          "projectUrl": { "type": "string" },
-          "licenseUrl": { "type": "string" },
-          "iconUrl": { "type": "string" },
+          "@type": {
+            "const": "Package"
+          },
+          "authors": {
+            "type": "string"
+          },
+          "id": {
+            "type": "string"
+          },
+          "summary": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "totalDownloads": {
+            "const": 0
+          },
+          "verified": {
+            "const": true
+          },
+          "tags": {
+            "type": "string"
+          },
+          "projectUrl": {
+            "type": "string"
+          },
+          "licenseUrl": {
+            "type": "string"
+          },
+          "iconUrl": {
+            "type": "string"
+          },
           "versions": {
             "type": "array",
             "items": {
               "type": "object",
-              "required": ["@id", "version", "downloads"],
+              "required": [
+                "@id",
+                "version",
+                "downloads"
+              ],
               "properties": {
-                "@id": { "type": "string" },
-                "version": { "type": "string" },
-                "downloads": { "const": 0 }
+                "@id": {
+                  "type": "string"
+                },
+                "version": {
+                  "type": "string"
+                },
+                "downloads": {
+                  "const": 0
+                },
+                "published": {
+                  "type": "string"
+                }
               }
             }
           }