Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 18 insertions, 0 deletions

diff --git a/db/migrate/20200402115013_add_index_on_modsecurity_to_ingress.rb b/db/migrate/20200402115013_add_index_on_modsecurity_to_ingress.rb
new file mode 100644
index 00000000000..8bd2d957092
--- /dev/null
+++ b/db/migrate/20200402115013_add_index_on_modsecurity_to_ingress.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddIndexOnModsecurityToIngress < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_clusters_applications_ingress_on_modsecurity'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :clusters_applications_ingress, [:modsecurity_enabled, :modsecurity_mode, :cluster_id], name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index :clusters_applications_ingress, [:modsecurity_enabled, :modsecurity_mode, :cluster_id], name: INDEX_NAME
+  end
+end