Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 0 deletions

diff --git a/db/migrate/20191016072826_replace_ci_trigger_requests_index.rb b/db/migrate/20191016072826_replace_ci_trigger_requests_index.rb
new file mode 100644
index 00000000000..d7c9524806e
--- /dev/null
+++ b/db/migrate/20191016072826_replace_ci_trigger_requests_index.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class ReplaceCiTriggerRequestsIndex < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :ci_trigger_requests, [:trigger_id, :id], order: { id: :desc }
+
+    remove_concurrent_index :ci_trigger_requests, [:trigger_id]
+  end
+
+  def down
+    add_concurrent_index :ci_trigger_requests, [:trigger_id]
+
+    remove_concurrent_index :ci_trigger_requests, [:trigger_id, :id], order: { id: :desc }
+  end
+end