Add latest changes from gitlab-org/gitlab@13-0-stable-ee

17 files changed, 186 insertions, 16 deletions

diff --git a/spec/fixtures/api/schemas/cluster_list.json b/spec/fixtures/api/schemas/cluster_list.json
new file mode 100644
index 00000000000..ece9542eb79
--- /dev/null
+++ b/spec/fixtures/api/schemas/cluster_list.json
@@ -0,0 +1,14 @@
+{
+  "clusters": {
+    "type": "array",
+    "items": {
+      "cluster_type": "string",
+      "enabled": "boolean",
+      "environment_scope": "string",
+      "name": "string",
+      "path": "string",
+      "status": "string"
+    }
+  },
+  "has_ancestor_clusters": { "type": ["boolean", "false"] }
+}
diff --git a/spec/fixtures/api/schemas/cluster_status.json b/spec/fixtures/api/schemas/cluster_status.json
index ce62655648b..f6db336fe65 100644
--- a/spec/fixtures/api/schemas/cluster_status.json
+++ b/spec/fixtures/api/schemas/cluster_status.json
@@ -42,6 +42,8 @@
         "host": {"type": ["string", "null"]},
         "port": {"type": ["integer", "514"]},
         "protocol": {"type": ["integer", "0"]},
+        "waf_log_enabled": {"type": ["boolean", "true"]},
+        "cilium_log_enabled": {"type": ["boolean", "true"]},
         "update_available": { "type": ["boolean", "null"] },
         "can_uninstall": { "type": "boolean" },
         "available_domains": {
diff --git a/spec/fixtures/api/schemas/entities/accessibility_error.json b/spec/fixtures/api/schemas/entities/accessibility_error.json
new file mode 100644
index 00000000000..3ea84835505
--- /dev/null
+++ b/spec/fixtures/api/schemas/entities/accessibility_error.json
@@ -0,0 +1,40 @@
+{
+  "type": "object",
+  "required": [
+    "code",
+    "type",
+    "type_code",
+    "message",
+    "context",
+    "selector",
+    "runner",
+    "runner_extras"
+  ],
+  "properties": {
+    "code": {
+      "type": "string"
+    },
+    "type": {
+      "type": "string"
+    },
+    "type_code": {
+      "type": "integer"
+    },
+    "message": {
+      "type": "string"
+    },
+    "context": {
+      "type": "string"
+    },
+    "selector": {
+      "type": "string"
+    },
+    "runner": {
+      "type": "string"
+    },
+    "runner_extras": {
+      "type": ["object", "null"]
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/entities/accessibility_reports_comparer.json b/spec/fixtures/api/schemas/entities/accessibility_reports_comparer.json
new file mode 100644
index 00000000000..ec243354eab
--- /dev/null
+++ b/spec/fixtures/api/schemas/entities/accessibility_reports_comparer.json
@@ -0,0 +1,43 @@
+{
+  "type": "object",
+  "required": ["status", "summary", "new_errors", "resolved_errors", "existing_errors"],
+  "properties": {
+    "status": {
+      "type": "string"
+    },
+    "summary": {
+      "type": "object",
+      "properties": {
+        "total": {
+          "type": "integer"
+        },
+        "resolved": {
+          "type": "integer"
+        },
+        "errored": {
+          "type": "integer"
+        }
+      },
+      "required": ["total", "resolved", "errored"]
+    },
+    "new_errors": {
+      "type": "array",
+      "items": {
+        "$ref": "accessibility_error.json"
+      }
+    },
+    "resolved_errors": {
+      "type": "array",
+      "items": {
+        "$ref": "accessibility_error.json"
+      }
+    },
+    "existing_errors": {
+      "type": "array",
+      "items": {
+        "$ref": "accessibility_error.json"
+      }
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/entities/discussion.json b/spec/fixtures/api/schemas/entities/discussion.json
index 9d7ca62435e..21d8efe0b2b 100644
--- a/spec/fixtures/api/schemas/entities/discussion.json
+++ b/spec/fixtures/api/schemas/entities/discussion.json
@@ -29,8 +29,15 @@
               "web_url": { "type": "uri" },
               "status_tooltip_html": { "type": ["string", "null"] },
               "path": { "type": "string" }
-            },
-            "additionalProperties": false
+            }, 
+            "required": [
+              "id",
+              "state",
+              "avatar_url",
+              "path",
+              "name",
+              "username"
+            ]
           },
           "created_at": { "type": "date" },
           "updated_at": { "type": "date" },
diff --git a/spec/fixtures/api/schemas/entities/note_user_entity.json b/spec/fixtures/api/schemas/entities/note_user_entity.json
index 9b838054563..4a27d885cdc 100644
--- a/spec/fixtures/api/schemas/entities/note_user_entity.json
+++ b/spec/fixtures/api/schemas/entities/note_user_entity.json
@@ -16,6 +16,5 @@
     "name": { "type": "string" },
     "username": { "type": "string" },
     "status_tooltip_html": { "$ref": "../types/nullable_string.json" }
-  },
-  "additionalProperties": false
+  }
 }
diff --git a/spec/fixtures/api/schemas/entities/user.json b/spec/fixtures/api/schemas/entities/user.json
index 82d80b75cef..3252a37c82a 100644
--- a/spec/fixtures/api/schemas/entities/user.json
+++ b/spec/fixtures/api/schemas/entities/user.json
@@ -18,6 +18,5 @@
     "name": { "type": "string" },
     "username": { "type": "string" },
     "status_tooltip_html": { "$ref": "../types/nullable_string.json" }
-  },
-  "additionalProperties": false
+  }
 }
diff --git a/spec/fixtures/api/schemas/pipeline_schedule.json b/spec/fixtures/api/schemas/pipeline_schedule.json
index 690c4a7d4e8..d01801a15fa 100644
--- a/spec/fixtures/api/schemas/pipeline_schedule.json
+++ b/spec/fixtures/api/schemas/pipeline_schedule.json
@@ -30,7 +30,9 @@
         "avatar_url": { "type": "uri" },
         "web_url": { "type": "uri" }
       },
-      "additionalProperties": false
+      "required": [
+        "id", "name", "username", "state", "avatar_url", "web_url"
+      ]
     },
     "variables": {
       "type": "array",
diff --git a/spec/fixtures/api/schemas/public_api/v4/branch.json b/spec/fixtures/api/schemas/public_api/v4/branch.json
index 3b0f010bc4f..0073a6d89fc 100644
--- a/spec/fixtures/api/schemas/public_api/v4/branch.json
+++ b/spec/fixtures/api/schemas/public_api/v4/branch.json
@@ -7,7 +7,8 @@
     "protected",
     "default",
     "developers_can_push",
-    "developers_can_merge"
+    "developers_can_merge",
+    "web_url"
   ],
   "properties" : {
     "name": { "type": "string" },
@@ -17,7 +18,8 @@
     "default": { "type": "boolean" },
     "developers_can_push": { "type": "boolean" },
     "developers_can_merge": { "type": "boolean" },
-    "can_push": { "type": "boolean" }
+    "can_push": { "type": "boolean" },
+    "web_url": { "type": "uri" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/freeze_period.json b/spec/fixtures/api/schemas/public_api/v4/freeze_period.json
new file mode 100644
index 00000000000..b0187aee647
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/freeze_period.json
@@ -0,0 +1,20 @@
+{
+  "type": "object",
+  "required": [
+    "id",
+    "freeze_start",
+    "freeze_end",
+    "cron_timezone",
+    "created_at",
+    "updated_at"
+  ],
+  "properties": {
+    "id": { "type": "integer" },
+    "freeze_start": { "type": "string" },
+    "freeze_end": { "type": "string"},
+    "cron_timezone": { "type": "string" },
+    "created_at": { "type": "string" },
+    "updated_at": { "type": "string" }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/freeze_periods.json b/spec/fixtures/api/schemas/public_api/v4/freeze_periods.json
new file mode 100644
index 00000000000..1e1c29a3b64
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/freeze_periods.json
@@ -0,0 +1,5 @@
+{
+  "type": "array",
+  "items": { "$ref": "freeze_period.json" }
+}
+
diff --git a/spec/fixtures/api/schemas/public_api/v4/issue.json b/spec/fixtures/api/schemas/public_api/v4/issue.json
index bf1b4a06f0b..69ecba8b6f3 100644
--- a/spec/fixtures/api/schemas/public_api/v4/issue.json
+++ b/spec/fixtures/api/schemas/public_api/v4/issue.json
@@ -71,7 +71,14 @@
         "avatar_url": { "type": "uri" },
         "web_url": { "type": "uri" }
       },
-      "additionalProperties": false
+      "required": [
+        "id",
+        "state",
+        "avatar_url",
+        "name",
+        "username",
+        "web_url"
+      ]
     },
     "user_notes_count": { "type": "integer" },
     "upvotes": { "type": "integer" },
diff --git a/spec/fixtures/api/schemas/public_api/v4/members.json b/spec/fixtures/api/schemas/public_api/v4/members.json
index 38ad64ad061..695f00b0040 100644
--- a/spec/fixtures/api/schemas/public_api/v4/members.json
+++ b/spec/fixtures/api/schemas/public_api/v4/members.json
@@ -15,8 +15,7 @@
     },
     "required": [
       "id", "name", "username", "state",
-      "web_url", "access_level", "expires_at"
-    ],
-    "additionalProperties": false
+      "web_url", "access_level", "expires_at", "avatar_url"
+    ]
   }
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/notes.json b/spec/fixtures/api/schemas/public_api/v4/notes.json
index d15d2e90b05..683dcb19836 100644
--- a/spec/fixtures/api/schemas/public_api/v4/notes.json
+++ b/spec/fixtures/api/schemas/public_api/v4/notes.json
@@ -17,7 +17,9 @@
           "avatar_url": { "type": "uri" },
           "web_url": { "type": "uri" }
         },
-        "additionalProperties": false
+        "required" : [
+          "id", "name", "username", "state", "avatar_url", "web_url"
+        ]
       },
       "commands_changes": { "type": "object", "additionalProperties": true },
       "created_at": { "type": "date" },
diff --git a/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_move.json b/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_move.json
new file mode 100644
index 00000000000..6f8a2ff58e5
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_move.json
@@ -0,0 +1,20 @@
+{
+  "type": "object",
+  "required": [
+    "id",
+    "created_at",
+    "state",
+    "source_storage_name",
+    "destination_storage_name",
+    "project"
+  ],
+  "properties" : {
+    "id": { "type": "integer" },
+    "created_at": { "type": "date" },
+    "state": { "type": "string" },
+    "source_storage_name": { "type": "string" },
+    "destination_storage_name": { "type": "string" },
+    "project": { "type": "object" }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_moves.json b/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_moves.json
new file mode 100644
index 00000000000..b2de185fbfe
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_moves.json
@@ -0,0 +1,6 @@
+{
+  "type": "array",
+  "items": {
+    "$ref": "./project_repository_storage_move.json"
+  }
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/snippets.json b/spec/fixtures/api/schemas/public_api/v4/snippets.json
index d13d703e063..7baa24a6f1f 100644
--- a/spec/fixtures/api/schemas/public_api/v4/snippets.json
+++ b/spec/fixtures/api/schemas/public_api/v4/snippets.json
@@ -10,6 +10,7 @@
       "description": { "type": ["string", "null"] },
       "visibility": { "type": "string" },
       "web_url": { "type": "string" },
+      "raw_url": { "type": "string" },
       "created_at": { "type": "date" },
       "updated_at": { "type": "date" },
       "author": {
@@ -22,12 +23,14 @@
           "avatar_url": { "type": "uri" },
           "web_url": { "type": "uri" }
         },
-        "additionalProperties": false
+        "required" : [
+          "id", "name", "username", "state", "avatar_url", "web_url"
+        ]
       }
     },
     "required": [
       "id", "title", "file_name", "description", "web_url",
-      "created_at", "updated_at", "author"
+      "created_at", "updated_at", "author", "raw_url"
     ],
     "additionalProperties": false
   }