Add latest changes from gitlab-org/gitlab@master

3 files changed, 73 insertions, 17 deletions

diff --git a/spec/fixtures/api/schemas/entities/note_user_entity.json b/spec/fixtures/api/schemas/entities/note_user_entity.json
index f5d28dd7b71..16d33ada51d 100644
--- a/spec/fixtures/api/schemas/entities/note_user_entity.json
+++ b/spec/fixtures/api/schemas/entities/note_user_entity.json
@@ -3,19 +3,42 @@
   "required": [
     "id",
     "state",
+    "locked",
     "avatar_url",
     "path",
     "name",
     "username"
   ],
   "properties": {
-    "id": { "type": "integer" },
-    "state": { "type": "string" },
-    "avatar_url": { "type": [ "string", "null" ] },
-    "path": { "type": "string" },
-    "name": { "type": "string" },
-    "username": { "type": "string" },
-    "status_tooltip_html": { "$ref": "../types/nullable_string.json" },
-    "show_status": { "type": "boolean" }
+    "id": {
+      "type": "integer"
+    },
+    "state": {
+      "type": "string"
+    },
+    "locked": {
+      "type": "boolean"
+    },
+    "avatar_url": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "path": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    },
+    "username": {
+      "type": "string"
+    },
+    "status_tooltip_html": {
+      "$ref": "../types/nullable_string.json"
+    },
+    "show_status": {
+      "type": "boolean"
+    }
   }
 }
diff --git a/spec/fixtures/api/schemas/entities/user.json b/spec/fixtures/api/schemas/entities/user.json
index 984b7184d36..ca2ad201d66 100644
--- a/spec/fixtures/api/schemas/entities/user.json
+++ b/spec/fixtures/api/schemas/entities/user.json
@@ -3,6 +3,7 @@
   "required": [
     "id",
     "state",
+    "locked",
     "avatar_url",
     "web_url",
     "path",
@@ -10,13 +11,35 @@
     "username"
   ],
   "properties": {
-    "id": { "type": "integer" },
-    "state": { "type": "string" },
-    "avatar_url": { "type": [ "string", "null" ] },
-    "web_url": { "type": "string" },
-    "path": { "type": "string" },
-    "name": { "type": "string" },
-    "username": { "type": "string" },
-    "status_tooltip_html": { "$ref": "../types/nullable_string.json" }
+    "id": {
+      "type": "integer"
+    },
+    "state": {
+      "type": "string"
+    },
+    "locked": {
+      "type": "boolean"
+    },
+    "avatar_url": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "web_url": {
+      "type": "string"
+    },
+    "path": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    },
+    "username": {
+      "type": "string"
+    },
+    "status_tooltip_html": {
+      "$ref": "../types/nullable_string.json"
+    }
   }
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/issue.json b/spec/fixtures/api/schemas/public_api/v4/issue.json
index c2b096a922f..dbec110bccf 100644
--- a/spec/fixtures/api/schemas/public_api/v4/issue.json
+++ b/spec/fixtures/api/schemas/public_api/v4/issue.json
@@ -150,6 +150,9 @@
           "state": {
             "type": "string"
           },
+          "locked": {
+            "type": "boolean"
+          },
           "avatar_url": {
             "type": "string",
             "format": "uri"
@@ -180,6 +183,9 @@
         "state": {
           "type": "string"
         },
+        "locked": {
+          "type": "boolean"
+        },
         "avatar_url": {
           "type": "string",
           "format": "uri"
@@ -206,6 +212,9 @@
         "state": {
           "type": "string"
         },
+        "locked": {
+          "type": "boolean"
+        },
         "avatar_url": {
           "type": "string",
           "format": "uri"
@@ -218,6 +227,7 @@
       "required": [
         "id",
         "state",
+        "locked",
         "avatar_url",
         "name",
         "username",
@@ -308,4 +318,4 @@
     "confidential",
     "web_url"
   ]
-}
\ No newline at end of file
+}