Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 0 deletions

diff --git a/db/migrate/20190918104212_add_merge_request_metrics_merged_at_index.rb b/db/migrate/20190918104212_add_merge_request_metrics_merged_at_index.rb
new file mode 100644
index 00000000000..9db4e42f3ee
--- /dev/null
+++ b/db/migrate/20190918104212_add_merge_request_metrics_merged_at_index.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddMergeRequestMetricsMergedAtIndex < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :merge_request_metrics, [:merged_at, :id]
+  end
+
+  def down
+    remove_concurrent_index :merge_request_metrics, [:merged_at, :id]
+  end
+end