Add latest changes from gitlab-org/gitlab@master

2 files changed, 36 insertions, 0 deletions

diff --git a/db/post_migrate/20200407094005_drop_vulnerability_severity_index.rb b/db/post_migrate/20200407094005_drop_vulnerability_severity_index.rb
new file mode 100644
index 00000000000..14e6ce32097
--- /dev/null
+++ b/db/post_migrate/20200407094005_drop_vulnerability_severity_index.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class DropVulnerabilitySeverityIndex < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  DOWNTIME = false
+  INDEX_NAME = 'undefined_vulnerabilities'
+
+  def up
+    remove_concurrent_index_by_name :vulnerability_occurrences, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index(:vulnerability_occurrences, :id, where: 'severity = 0', name: INDEX_NAME)
+  end
+end
diff --git a/db/post_migrate/20200407094923_drop_vulnerabilities_severity_index.rb b/db/post_migrate/20200407094923_drop_vulnerabilities_severity_index.rb
new file mode 100644
index 00000000000..90ec7dc7ec2
--- /dev/null
+++ b/db/post_migrate/20200407094923_drop_vulnerabilities_severity_index.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class DropVulnerabilitiesSeverityIndex < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  DOWNTIME = false
+  INDEX_NAME = 'undefined_vulnerability'
+
+  def up
+    remove_concurrent_index_by_name :vulnerabilities, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index(:vulnerabilities, :id, where: 'severity = 0', name: INDEX_NAME)
+  end
+end