Add latest changes from gitlab-org/gitlab@master

5 files changed, 30 insertions, 3 deletions

diff --git a/doc/administration/logs.md b/doc/administration/logs.md
index 66f6942da01..a67674de41a 100644
--- a/doc/administration/logs.md
+++ b/doc/administration/logs.md
@@ -608,7 +608,7 @@ installations from source.
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/19186) in GitLab 12.6.
 
-This file lives in `/var/log/gitlab/mail_room/mail_room_json.log` for
+This file lives in `/var/log/gitlab/mailroom/mail_room_json.log` for
 Omnibus GitLab packages or in `/home/git/gitlab/log/mail_room_json.log` for
 installations from source.
 
@@ -648,7 +648,7 @@ It's stored at:
 - `/var/log/gitlab/gitlab-rails/database_load_balancing.log` for Omnibus GitLab packages.
 - `/home/git/gitlab/log/database_load_balancing.log` for installations from source.
 
-## `elasticsearch.log`
+## `elasticsearch.log` **(STARTER ONLY)**
 
 > Introduced in GitLab 12.6.
 
@@ -718,7 +718,7 @@ Each line contains a JSON line that can be ingested by Elasticsearch. For exampl
 }
 ```
 
-## `geo.log`
+## `geo.log` **(PREMIUM ONLY)**
 
 > Introduced in 9.5.
 
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 72dc13c51ae..2919cc59712 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -10092,6 +10092,11 @@ type User {
   ): SnippetConnection
 
   """
+  State of the issue
+  """
+  state: String!
+
+  """
   Todos of the user
   """
   todos(
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 2a99cf388b2..3e39e418909 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -30222,6 +30222,24 @@
               "deprecationReason": null
             },
             {
+              "name": "state",
+              "description": "State of the issue",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "todos",
               "description": "Todos of the user",
               "args": [
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 4bf97ede2ed..444e6358d6b 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -1567,6 +1567,7 @@ Autogenerated return type of UpdateSnippet
 | `avatarUrl` | String | URL of the user's avatar |
 | `id` | ID! | ID of the user |
 | `name` | String! | Human-readable name of the user |
+| `state` | String! | State of the issue |
 | `userPermissions` | UserPermissions! | Permissions for the current user on the resource |
 | `username` | String! | Username of the user. Unique within this instance of GitLab |
 | `webUrl` | String! | Web URL of the user |
diff --git a/doc/development/fe_guide/style/javascript.md b/doc/development/fe_guide/style/javascript.md
index 2f0ed3c8918..b69a6f1941c 100644
--- a/doc/development/fe_guide/style/javascript.md
+++ b/doc/development/fe_guide/style/javascript.md
@@ -184,6 +184,9 @@ This can help to quickly understand the control flow.
 // bad
 if (isThingNull) return '';
 
+if (isThingNull)
+  return '';
+
 // good
 if (isThingNull) {
   return '';