Add latest changes from gitlab-org/gitlab@master

3 files changed, 22 insertions, 0 deletions

diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md
index 054f0a35cb8..e1a8ecfdb3f 100644
--- a/doc/administration/instance_limits.md
+++ b/doc/administration/instance_limits.md
@@ -86,3 +86,22 @@ Plan.default.limits.update!(ci_active_jobs: 500)
 ```
 
 NOTE: **Note:** Set the limit to `0` to disable it.
+
+## Advanced Global Search limits
+
+### Maximum field length
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/201826) in GitLab 12.8.
+
+You can set a limit on the content of text fields indexed for Global Search.
+Setting a maximum helps to reduce the load of the indexing processes.  If any
+text field exceeds this limit then the text will be truncated to this number of
+characters and the rest will not be indexed and hence will not be searchable.
+
+- On GitLab.com this is limited to 20000 characters
+- For self-hosted installations it is unlimited by default
+
+This limit can be configured for self hosted installations when [enabling
+Elasticsearch](../integration/elasticsearch.md#enabling-elasticsearch).
+
+NOTE: **Note:** Set the limit to `0` to disable it.
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md
index fcc4646bfd5..5e0e1919ab7 100644
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
@@ -150,6 +150,7 @@ The following Elasticsearch settings are available:
 | `AWS Region`                                          | The AWS region your Elasticsearch service is located in. |
 | `AWS Access Key`                                      | The AWS access key. |
 | `AWS Secret Access Key`                               | The AWS secret access key. |
+| `Maximum field length`                                | See [the explanation in instance limits.](../administration/instance_limits.md#maximum-field-length). |
 
 ### Limiting namespaces and projects
 
diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md
index ad0e33207ce..a0a4a9f55ea 100644
--- a/doc/user/project/service_desk.md
+++ b/doc/user/project/service_desk.md
@@ -110,6 +110,8 @@ in the email, `%{ISSUE_PATH}` placeholder which will be replaced by
 
 ### Using custom email display name
 
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/7529) in GitLab 12.8.
+
 You can customize the email display name. Emails sent from Service Desk will have
 this name in the `From` header. The default display name is `GitLab Support Bot`.