Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 0 deletions

diff --git a/db/migrate/20200207132752_add_es_bulk_config.rb b/db/migrate/20200207132752_add_es_bulk_config.rb
new file mode 100644
index 00000000000..c460971139c
--- /dev/null
+++ b/db/migrate/20200207132752_add_es_bulk_config.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddEsBulkConfig < ActiveRecord::Migration[6.0]
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  def change
+    add_column :application_settings, :elasticsearch_max_bulk_size_mb, :smallint, null: false, default: 10
+    add_column :application_settings, :elasticsearch_max_bulk_concurrency, :smallint, null: false, default: 10
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 162964f25e8..a6c2edabeaf 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -344,6 +344,8 @@ ActiveRecord::Schema.define(version: 2020_02_11_152410) do
     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.integer "elasticsearch_max_bulk_size_mb", limit: 2, default: 10, null: false
+    t.integer "elasticsearch_max_bulk_concurrency", limit: 2, default: 10, 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"