Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

6 files changed, 61 insertions, 37 deletions

diff --git a/spec/fixtures/api/schemas/board.json b/spec/fixtures/api/schemas/board.json
deleted file mode 100644
index 7c146647948..00000000000
--- a/spec/fixtures/api/schemas/board.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "type": "object",
-  "required" : [
-    "id"
-  ],
-  "properties" : {
-    "id": { "type": "integer" },
-    "name": { "type": "string" }
-  }
-}
diff --git a/spec/fixtures/api/schemas/boards.json b/spec/fixtures/api/schemas/boards.json
deleted file mode 100644
index 117564ef77a..00000000000
--- a/spec/fixtures/api/schemas/boards.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "type": "array",
-  "items": { "$ref": "board.json" }
-}
diff --git a/spec/fixtures/api/schemas/current-board.json b/spec/fixtures/api/schemas/current-board.json
deleted file mode 100644
index 2ddc038e908..00000000000
--- a/spec/fixtures/api/schemas/current-board.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "type": "object",
-  "allOf": [
-    { "$ref": "board.json" },
-    {
-      "required" : [
-        "id",
-        "name"
-      ],
-      "properties": {
-        "id": { "type": "integer" },
-        "name": { "type": "string" }
-      }
-    }
-  ]
-}
diff --git a/spec/fixtures/api/schemas/ml/get_experiment.json b/spec/fixtures/api/schemas/ml/get_experiment.json
index cf8da7f999f..482455a89e1 100644
--- a/spec/fixtures/api/schemas/ml/get_experiment.json
+++ b/spec/fixtures/api/schemas/ml/get_experiment.json
@@ -6,18 +6,31 @@
   "properties": {
     "experiment": {
       "type": "object",
-      "required" : [
+      "required": [
         "experiment_id",
         "name",
         "artifact_location",
         "lifecycle_stage"
       ],
-      "properties" : {
-        "experiment_id": { "type": "string" },
-        "name": { "type": "string" },
-        "artifact_location": { "type": "string" },
-        "lifecycle_stage": { "type": { "enum" : ["active", "deleted"] } }
+      "properties": {
+        "experiment_id": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "artifact_location": {
+          "type": "string"
+        },
+        "lifecycle_stage": {
+          "type": {
+            "enum": [
+              "active",
+              "deleted"
+            ]
+          }
+        }
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/spec/fixtures/api/schemas/ml/list_experiments.json b/spec/fixtures/api/schemas/ml/list_experiments.json
new file mode 100644
index 00000000000..4c3e834abc6
--- /dev/null
+++ b/spec/fixtures/api/schemas/ml/list_experiments.json
@@ -0,0 +1,39 @@
+{
+  "type": "object",
+  "required": [
+    "experiments"
+  ],
+  "properties": {
+    "experiments": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": [
+          "experiment_id",
+          "name",
+          "artifact_location",
+          "lifecycle_stage"
+        ],
+        "properties": {
+          "experiment_id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "artifact_location": {
+            "type": "string"
+          },
+          "lifecycle_stage": {
+            "type": {
+              "enum": [
+                "active",
+                "deleted"
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/spec/fixtures/api/schemas/public_api/v4/user/admin.json b/spec/fixtures/api/schemas/public_api/v4/user/admin.json
index 8d06e16848f..f0d3cf3ba0e 100644
--- a/spec/fixtures/api/schemas/public_api/v4/user/admin.json
+++ b/spec/fixtures/api/schemas/public_api/v4/user/admin.json
@@ -4,6 +4,7 @@
     "id",
     "username",
     "email",
+    "commit_email",
     "name",
     "state",
     "avatar_url",
@@ -12,6 +13,7 @@
     "is_admin",
     "bio",
     "location",
+    "pronouns",
     "skype",
     "linkedin",
     "twitter",