Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 0 deletions

diff --git a/db/migrate/20200319203901_add_index_on_users_unlock_token.rb b/db/migrate/20200319203901_add_index_on_users_unlock_token.rb
new file mode 100644
index 00000000000..931e685f3fe
--- /dev/null
+++ b/db/migrate/20200319203901_add_index_on_users_unlock_token.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddIndexOnUsersUnlockToken < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_users_on_unlock_token'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :users, :unlock_token, unique: true, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index :users, :unlock_token, unique: true, name: INDEX_NAME
+  end
+end