Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

12 files changed, 182 insertions, 37 deletions

diff --git a/spec/fixtures/api/schemas/entities/discussion.json b/spec/fixtures/api/schemas/entities/discussion.json
index 2afabcc9195..1a5b8150ed2 100644
--- a/spec/fixtures/api/schemas/entities/discussion.json
+++ b/spec/fixtures/api/schemas/entities/discussion.json
@@ -48,6 +48,7 @@
           "resolved": { "type": "boolean" },
           "resolvable": { "type": "boolean" },
           "resolved_by": { "type": ["string", "null"] },
+          "resolved_at": { "type": ["date", "null"] },
           "note": { "type": "string" },
           "note_html": { "type": "string"  },
           "current_user": { "type": "object" },
diff --git a/spec/fixtures/api/schemas/group_member.json b/spec/fixtures/api/schemas/entities/member.json
index 3425108e46e..e8b40745803 100644
--- a/spec/fixtures/api/schemas/group_member.json
+++ b/spec/fixtures/api/schemas/entities/member.json
@@ -24,16 +24,18 @@
       "properties": {
         "integer_value": { "type": "integer" },
         "string_value": { "type": "string" }
-      }
+      },
+      "additionalProperties": false
     },
     "source": {
       "type": "object",
-      "required": ["id", "name", "web_url"],
+      "required": ["id", "full_name", "web_url"],
       "properties": {
         "id": { "type": "integer" },
-        "name": { "type": "string" },
+        "full_name": { "type": "string" },
         "web_url": { "type": "string" }
-      }
+      },
+      "additionalProperties": false
     },
     "valid_roles": { "type": "object" },
     "created_by": {
@@ -42,39 +44,13 @@
       "properties": {
         "name": { "type": "string" },
         "web_url": { "type": "string" }
-      }
+      },
+      "additionalProperties": false
     },
     "user": {
-      "type": "object",
-      "required": [
-        "id",
-        "name",
-        "username",
-        "avatar_url",
-        "web_url",
-        "blocked",
-        "two_factor_enabled"
-      ],
-      "properties": {
-        "id": { "type": "integer" },
-        "name": { "type": "string" },
-        "username": { "type": "string" },
-        "avatar_url": { "type": ["string", "null"] },
-        "web_url": { "type": "string" },
-        "blocked": { "type": "boolean" },
-        "two_factor_enabled": { "type": "boolean" },
-        "status": {
-          "type": "object",
-          "required": [
-            "emoji",
-            "message_html"
-          ],
-          "properties": {
-            "emoji": { "type": "string" },
-            "message_html": { "type": "string" }
-          }
-        }
-      }
+      "allOf": [
+        { "$ref": "member_user.json" }
+      ]
     },
     "invite": {
       "type": "object",
@@ -83,7 +59,8 @@
         "email": { "type": "string" },
         "avatar_url": { "type": "string" },
         "can_resend": { "type": "boolean" }
-      }
+      },
+      "additionalProperties": false
     }
   }
 }
diff --git a/spec/fixtures/api/schemas/entities/member_user.json b/spec/fixtures/api/schemas/entities/member_user.json
new file mode 100644
index 00000000000..983cdb7b9d9
--- /dev/null
+++ b/spec/fixtures/api/schemas/entities/member_user.json
@@ -0,0 +1,22 @@
+{
+  "type": "object",
+  "required": ["id", "name", "username", "avatar_url", "web_url", "blocked", "two_factor_enabled"],
+  "properties": {
+    "id": { "type": "integer" },
+    "name": { "type": "string" },
+    "username": { "type": "string" },
+    "avatar_url": { "type": ["string", "null"] },
+    "web_url": { "type": "string" },
+    "blocked": { "type": "boolean" },
+    "two_factor_enabled": { "type": "boolean" },
+    "status": {
+      "type": "object",
+      "required": ["emoji"],
+      "properties": {
+        "emoji": { "type": "string" }
+      },
+      "additionalProperties": false
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/environment.json b/spec/fixtures/api/schemas/environment.json
index b8c4253056e..4f54a77e6b2 100644
--- a/spec/fixtures/api/schemas/environment.json
+++ b/spec/fixtures/api/schemas/environment.json
@@ -37,6 +37,12 @@
     "has_opened_alert": { "type": "boolean" },
     "cluster_type": { "type": "types/nullable_string.json" },
     "terminal_path": { "type": "types/nullable_string.json" },
+    "rollout_status": {
+      "oneOf": [
+        { "type": "null" },
+        { "$ref": "rollout_status.json" }
+      ]
+    },
     "last_deployment": {
       "oneOf": [
         { "type": "null" },
diff --git a/spec/fixtures/api/schemas/graphql/namespace/package_settings.json b/spec/fixtures/api/schemas/graphql/namespace/package_settings.json
new file mode 100644
index 00000000000..c1286ee0944
--- /dev/null
+++ b/spec/fixtures/api/schemas/graphql/namespace/package_settings.json
@@ -0,0 +1,12 @@
+{
+  "type": "object",
+  "required": ["mavenDuplicatesAllowed", "mavenDuplicateExceptionRegex"],
+  "properties": {
+    "mavenDuplicatesAllowed": {
+      "type": "boolean"
+    },
+    "mavenDuplicateExceptionRegex": {
+      "type": "string"
+    }
+  }
+}
diff --git a/spec/fixtures/api/schemas/graphql/packages/package_composer_details.json b/spec/fixtures/api/schemas/graphql/packages/package_composer_details.json
new file mode 100644
index 00000000000..bcf64a6e567
--- /dev/null
+++ b/spec/fixtures/api/schemas/graphql/packages/package_composer_details.json
@@ -0,0 +1,12 @@
+{
+  "type": "object",
+  "allOf": [{ "$ref": "./package_details.json" }],
+  "properties": {
+    "target_sha": {
+      "type": "string"
+    },
+    "composer_json": {
+      "type": "object"
+    }
+  }
+}
diff --git a/spec/fixtures/api/schemas/graphql/packages/package_details.json b/spec/fixtures/api/schemas/graphql/packages/package_details.json
new file mode 100644
index 00000000000..4f90285183c
--- /dev/null
+++ b/spec/fixtures/api/schemas/graphql/packages/package_details.json
@@ -0,0 +1,36 @@
+{
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    },
+    "createdAt": {
+      "type": "string"
+    },
+    "updatedAt": {
+      "type": "string"
+    },
+    "version": {
+      "type": ["string", "null"]
+    },
+    "package_type": {
+      "type": ["string"],
+      "enum": ["MAVEN", "NPM", "CONAN", "NUGET", "PYPI", "COMPOSER", "GENERIC", "GOLANG", "DEBIAN"]
+    },
+    "tags": {
+      "type": "object"
+    },
+    "project": {
+      "type": "object"
+    },
+    "pipelines": {
+      "type": "object"
+    },
+    "versions": {
+      "type": "object"
+    }
+  }
+}
diff --git a/spec/fixtures/api/schemas/group_members.json b/spec/fixtures/api/schemas/members.json
index 6268c7ef4d8..0b0b56da9f8 100644
--- a/spec/fixtures/api/schemas/group_members.json
+++ b/spec/fixtures/api/schemas/members.json
@@ -1,6 +1,6 @@
 {
   "type": "array",
   "items": {
-    "$ref": "group_member.json"
+    "$ref": "entities/member.json"
   }
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/notes.json b/spec/fixtures/api/schemas/public_api/v4/notes.json
index 683dcb19836..c4510207882 100644
--- a/spec/fixtures/api/schemas/public_api/v4/notes.json
+++ b/spec/fixtures/api/schemas/public_api/v4/notes.json
@@ -31,6 +31,7 @@
       "resolved": { "type": "boolean" },
       "resolvable": { "type": "boolean" },
       "resolved_by": { "type": ["string", "null"] },
+      "resolved_at": { "type": ["date", "null"] },
       "confidential": { "type": ["boolean", "null"] }
     },
     "required": [
diff --git a/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json b/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json
new file mode 100644
index 00000000000..f51e7e8edc5
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json
@@ -0,0 +1,20 @@
+{
+  "type": "object",
+  "required": [
+    "id",
+    "created_at",
+    "state",
+    "source_storage_name",
+    "destination_storage_name",
+    "snippet"
+  ],
+  "properties" : {
+    "id": { "type": "integer" },
+    "created_at": { "type": "date" },
+    "state": { "type": "string" },
+    "source_storage_name": { "type": "string" },
+    "destination_storage_name": { "type": "string" },
+    "snippet": { "type": "object" }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_moves.json b/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_moves.json
new file mode 100644
index 00000000000..292bb335539
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_moves.json
@@ -0,0 +1,6 @@
+{
+  "type": "array",
+  "items": {
+    "$ref": "./snippet_repository_storage_move.json"
+  }
+}
diff --git a/spec/fixtures/api/schemas/rollout_status.json b/spec/fixtures/api/schemas/rollout_status.json
new file mode 100644
index 00000000000..334bed4ab65
--- /dev/null
+++ b/spec/fixtures/api/schemas/rollout_status.json
@@ -0,0 +1,52 @@
+{
+    "type": "object",
+    "additionalProperties": false,
+    "required": [
+        "status"
+    ],
+    "properties": {
+        "status": {
+            "type": "string"
+        },
+        "completion": {
+            "type": "integer"
+        },
+        "is_completed": {
+            "type": "boolean"
+        },
+        "has_legacy_app_label": {
+            "type": "boolean"
+        },
+        "instances": {
+            "type": "array",
+            "items": {
+                "additionalProperties": false,
+                "type": "object",
+                "required": [
+                    "status",
+                    "pod_name",
+                    "tooltip",
+                    "track",
+                    "stable"
+                ],
+                "properties": {
+                    "status": {
+                        "type": "string"
+                    },
+                    "pod_name": {
+                        "type": "string"
+                    },
+                    "tooltip": {
+                        "type": "string"
+                    },
+                    "track": {
+                        "type": "string"
+                    },
+                    "stable": {
+                        "type": "boolean"
+                    }
+                }
+            }
+        }
+    }
+}