Add latest changes from gitlab-org/gitlab@master

6 files changed, 46 insertions, 39 deletions

diff --git a/db/migrate/20200204070729_add_elasticsearch_indexed_field_length_limit_to_application_settings.rb b/db/migrate/20200204070729_add_elasticsearch_indexed_field_length_limit_to_application_settings.rb
new file mode 100644
index 00000000000..7d478706613
--- /dev/null
+++ b/db/migrate/20200204070729_add_elasticsearch_indexed_field_length_limit_to_application_settings.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddElasticsearchIndexedFieldLengthLimitToApplicationSettings < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def up
+    add_column :application_settings, :elasticsearch_indexed_field_length_limit, :integer, null: false, default: 0
+
+    if Gitlab.com?
+      execute 'UPDATE application_settings SET elasticsearch_indexed_field_length_limit = 20000'
+    end
+  end
+
+  def down
+    remove_column :application_settings, :elasticsearch_indexed_field_length_limit
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c76b08467fe..a432e449951 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -343,6 +343,7 @@ ActiveRecord::Schema.define(version: 2020_02_06_111847) do
     t.boolean "force_pages_access_control", default: false, null: false
     t.boolean "updating_name_disabled_for_users", default: false, null: false
     t.integer "instance_administrators_group_id"
+    t.integer "elasticsearch_indexed_field_length_limit", default: 0, null: false
     t.index ["custom_project_templates_group_id"], name: "index_application_settings_on_custom_project_templates_group_id"
     t.index ["file_template_project_id"], name: "index_application_settings_on_file_template_project_id"
     t.index ["instance_administration_project_id"], name: "index_applicationsettings_on_instance_administration_project_id"
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`.
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 2a62c6eaa05..e290839dc69 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -10106,6 +10106,9 @@ msgstr ""
 msgid "Identities"
 msgstr ""
 
+msgid "If any indexed field exceeds this limit it will be truncated to this number of characters and the rest will not be indexed or searchable. This does not apply to repository and wiki indexing. Setting this to 0 means it is unlimited."
+msgstr ""
+
 msgid "If any job surpasses this timeout threshold, it will be marked as failed. Human readable time input language is accepted like \"1 hour\". Values without specification represent seconds."
 msgstr ""
 
@@ -11713,6 +11716,9 @@ msgstr ""
 msgid "Maximum duration of a session."
 msgstr ""
 
+msgid "Maximum field length"
+msgstr ""
+
 msgid "Maximum job timeout"
 msgstr ""
 
@@ -15956,9 +15962,6 @@ msgstr ""
 msgid "Reports|Classname"
 msgstr ""
 
-msgid "Reports|Confidence"
-msgstr ""
-
 msgid "Reports|Execution time"
 msgstr ""
 
@@ -16821,9 +16824,6 @@ msgstr ""
 msgid "SecurityDashboard|Add projects"
 msgstr ""
 
-msgid "SecurityDashboard|Confidence"
-msgstr ""
-
 msgid "SecurityDashboard|Edit dashboard"
 msgstr ""
 
@@ -21312,9 +21312,6 @@ msgstr ""
 msgid "Vulnerability|Class"
 msgstr ""
 
-msgid "Vulnerability|Confidence"
-msgstr ""
-
 msgid "Vulnerability|Description"
 msgstr ""
 
@@ -22400,9 +22397,6 @@ msgstr ""
 msgid "ciReport|(is loading, errors when loading results)"
 msgstr ""
 
-msgid "ciReport|All confidence levels"
-msgstr ""
-
 msgid "ciReport|All projects"
 msgstr ""
 
@@ -22424,9 +22418,6 @@ msgstr ""
 msgid "ciReport|Code quality"
 msgstr ""
 
-msgid "ciReport|Confidence"
-msgstr ""
-
 msgid "ciReport|Container Scanning"
 msgstr ""
 
@@ -22564,30 +22555,6 @@ msgstr ""
 msgid "commit %{commit_id}"
 msgstr ""
 
-msgid "confidence|Confirmed"
-msgstr ""
-
-msgid "confidence|Experimental"
-msgstr ""
-
-msgid "confidence|High"
-msgstr ""
-
-msgid "confidence|Ignore"
-msgstr ""
-
-msgid "confidence|Low"
-msgstr ""
-
-msgid "confidence|Medium"
-msgstr ""
-
-msgid "confidence|Undefined"
-msgstr ""
-
-msgid "confidence|Unknown"
-msgstr ""
-
 msgid "confidentiality|You are going to turn off the confidentiality. This means <strong>everyone</strong> will be able to see and leave a comment on this issue."
 msgstr ""