Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 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.