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

6 files changed, 19 insertions, 15 deletions

diff --git a/spec/fixtures/api/schemas/entities/merge_request_noteable.json b/spec/fixtures/api/schemas/entities/merge_request_noteable.json
index c0eb320e67f..4ef19ed32c2 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_noteable.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_noteable.json
@@ -32,7 +32,8 @@
     },
     "is_project_archived": { "type":  "boolean" },
     "locked_discussion_docs_path": { "type":  "string" },
-    "archived_project_docs_path": { "type":  "string" }
+    "archived_project_docs_path": { "type":  "string" },
+    "project_id": { "type": "integer"}
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/evidences/issue.json b/spec/fixtures/api/schemas/evidences/issue.json
index fd9daf17ab8..628c4c89312 100644
--- a/spec/fixtures/api/schemas/evidences/issue.json
+++ b/spec/fixtures/api/schemas/evidences/issue.json
@@ -4,7 +4,6 @@
     "id",
     "title",
     "description",
-    "author",
     "state",
     "iid",
     "confidential",
diff --git a/spec/fixtures/api/schemas/evidences/milestone.json b/spec/fixtures/api/schemas/evidences/milestone.json
index 3ce0644225b..ab27fdecde2 100644
--- a/spec/fixtures/api/schemas/evidences/milestone.json
+++ b/spec/fixtures/api/schemas/evidences/milestone.json
@@ -7,7 +7,8 @@
     "state",
     "iid",
     "created_at",
-    "due_date"
+    "due_date",
+    "issues"
   ],
   "properties": {
     "id": { "type": "integer" },
@@ -16,7 +17,11 @@
     "state": { "type": "string" },
     "iid": { "type": "integer" },
     "created_at": { "type": "date" },
-    "due_date": { "type": ["date", "null"] }
+    "due_date": { "type": ["date", "null"] },
+    "issues": {
+      "type": "array",
+      "items": { "$ref": "issue.json" }
+    }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/board.json b/spec/fixtures/api/schemas/public_api/v4/board.json
index e4933ee0b93..89a21c29969 100644
--- a/spec/fixtures/api/schemas/public_api/v4/board.json
+++ b/spec/fixtures/api/schemas/public_api/v4/board.json
@@ -78,7 +78,8 @@
           },
           "position": { "type": ["integer", "null"] },
           "max_issue_count": { "type": "integer" },
-          "max_issue_weight": { "type": "integer" }
+          "max_issue_weight": { "type": "integer" },
+          "limit_metric": { "type": ["string", "null"] }
         },
         "additionalProperties": false
       }
diff --git a/spec/fixtures/api/schemas/registry/repository.json b/spec/fixtures/api/schemas/registry/repository.json
index f7469aad235..1f84e787b19 100644
--- a/spec/fixtures/api/schemas/registry/repository.json
+++ b/spec/fixtures/api/schemas/registry/repository.json
@@ -1,13 +1,7 @@
 {
   "type": "object",
-  "required" : [
-    "id",
-    "name",
-    "path",
-    "location",
-    "created_at"
-  ],
-  "properties" : {
+  "required": ["id", "name", "path", "location", "created_at"],
+  "properties": {
     "id": {
       "type": "integer"
     },
@@ -38,7 +32,10 @@
         { "type": "string", "enum": ["delete_scheduled", "delete_failed"] }
       ]
     },
-    "tags": { "$ref": "tags.json" }
+    "tags": { "$ref": "tags.json" },
+    "tags_count": {
+      "type": "integer"
+    }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/release/link.json b/spec/fixtures/api/schemas/release/link.json
index bf175be2bc0..b3aebfa131e 100644
--- a/spec/fixtures/api/schemas/release/link.json
+++ b/spec/fixtures/api/schemas/release/link.json
@@ -7,7 +7,8 @@
     "filepath": { "type": "string" },
     "url": { "type": "string" },
     "direct_asset_url": { "type": "string" },
-    "external": { "type": "boolean" }
+    "external": { "type": "boolean" },
+    "link_type": { "type": "string" }
   },
   "additionalProperties": false
 }