Add latest changes from gitlab-org/gitlab@master

4 files changed, 48 insertions, 45 deletions

diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json b/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json
index 93b6dcde080..332e42fdbe5 100644
--- a/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json
@@ -8,6 +8,8 @@
       "package_id": { "type": "integer" },
       "file_name": { "type": "string" },
       "file_sha1": { "type": "string" },
+      "file_sha256": { "type": "string" },
+      "file_md5": { "type": "string" },
       "pipelines": {
         "items": { "$ref": "../pipeline.json" }
       }
diff --git a/spec/fixtures/api/schemas/public_api/v4/project.json b/spec/fixtures/api/schemas/public_api/v4/project.json
new file mode 100644
index 00000000000..4a3149f2bdc
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/project.json
@@ -0,0 +1,45 @@
+{
+  "type": "object",
+  "properties" : {
+    "id": { "type": "integer" },
+    "name": { "type": "string" },
+    "name_with_namespace": { "type": "string" },
+    "description": { "type": ["string", "null"] },
+    "path": { "type": "string" },
+    "path_with_namespace": { "type": "string" },
+    "created_at": { "type": "string", "format": "date-time" },
+    "default_branch": { "type": ["string", "null"] },
+    "tag_list": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "ssh_url_to_repo": { "type": "string" },
+    "http_url_to_repo": { "type": "string" },
+    "web_url": { "type": "string" },
+    "readme_url": { "type": ["string", "null"] },
+    "avatar_url": { "type": ["string", "null"] },
+    "star_count": { "type": "integer" },
+    "forks_count": { "type": "integer" },
+    "last_activity_at": { "type": "string", "format": "date-time" },
+    "namespace": {
+      "type": "object",
+      "properties" : {
+        "id": { "type": "integer" },
+        "name": { "type": "string" },
+        "path": { "type": "string" },
+        "kind": { "type": "string" },
+        "full_path": { "type": "string" },
+        "parent_id": { "type": ["integer", "null"] }
+      }
+    }
+  },
+  "required": [
+    "id", "name", "name_with_namespace", "description", "path",
+    "path_with_namespace", "created_at", "default_branch", "tag_list",
+    "ssh_url_to_repo", "http_url_to_repo", "web_url", "readme_url", "avatar_url",
+    "star_count", "forks_count", "last_activity_at", "namespace"
+  ],
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/projects.json b/spec/fixtures/api/schemas/public_api/v4/projects.json
index f0f8ede4c56..20f26a7f805 100644
--- a/spec/fixtures/api/schemas/public_api/v4/projects.json
+++ b/spec/fixtures/api/schemas/public_api/v4/projects.json
@@ -1,48 +1,4 @@
 {
   "type": "array",
-  "items": {
-    "type": "object",
-    "properties" : {
-      "id": { "type": "integer" },
-      "name": { "type": "string" },
-      "name_with_namespace": { "type": "string" },
-      "description": { "type": ["string", "null"] },
-      "path": { "type": "string" },
-      "path_with_namespace": { "type": "string" },
-      "created_at": { "type": "string", "format": "date-time" },
-      "default_branch": { "type": ["string", "null"] },
-      "tag_list": {
-        "type": "array",
-        "items": {
-          "type": "string"
-        }
-      },
-      "ssh_url_to_repo": { "type": "string" },
-      "http_url_to_repo": { "type": "string" },
-      "web_url": { "type": "string" },
-      "readme_url": { "type": ["string", "null"] },
-      "avatar_url": { "type": ["string", "null"] },
-      "star_count": { "type": "integer" },
-      "forks_count": { "type": "integer" },
-      "last_activity_at": { "type": "string", "format": "date-time" },
-      "namespace": {
-        "type": "object",
-        "properties" : {
-          "id": { "type": "integer" },
-          "name": { "type": "string" },
-          "path": { "type": "string" },
-          "kind": { "type": "string" },
-          "full_path": { "type": "string" },
-          "parent_id": { "type": ["integer", "null"] }
-        }
-      }
-    },
-    "required": [
-      "id", "name", "name_with_namespace", "description", "path",
-      "path_with_namespace", "created_at", "default_branch", "tag_list",
-      "ssh_url_to_repo", "http_url_to_repo", "web_url", "avatar_url",
-      "star_count", "last_activity_at", "namespace"
-    ],
-    "additionalProperties": false
-  }
+  "items": { "$ref": "project.json" }
 }
diff --git a/spec/fixtures/bulk_imports/labels.ndjson.gz b/spec/fixtures/bulk_imports/labels.ndjson.gz
new file mode 100644
index 00000000000..6bb10a53346
--- /dev/null
+++ b/spec/fixtures/bulk_imports/labels.ndjson.gz