diff options
author | Rémy Coutable <remy@rymai.me> | 2019-04-23 15:05:17 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-04-23 15:05:17 +0300 |
commit | d369d6924076547327b6d2200762b5cb40b57e31 (patch) | |
tree | d2b090d54f7a62092fa29a9df87de271ea67e76f /db/migrate | |
parent | dcb23df2f0194ab264d57cdc0b7c8ff1cc9c0e99 (diff) | |
parent | 97cd3e8c5ac3f96169b9b82e78b90f54ca1fcb22 (diff) |
Merge branch 'upgrade-to-rails-5-1' into 'master'
Upgrade Rails to 5.1
See merge request gitlab-org/gitlab-ce!27480
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/20161031181638_add_unique_index_to_subscriptions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/migrate/20161031181638_add_unique_index_to_subscriptions.rb b/db/migrate/20161031181638_add_unique_index_to_subscriptions.rb index 23a775d6282..9005b42b41f 100644 --- a/db/migrate/20161031181638_add_unique_index_to_subscriptions.rb +++ b/db/migrate/20161031181638_add_unique_index_to_subscriptions.rb @@ -9,11 +9,11 @@ class AddUniqueIndexToSubscriptions < ActiveRecord::Migration[4.2] def up add_concurrent_index :subscriptions, [:subscribable_id, :subscribable_type, :user_id, :project_id], { unique: true, name: 'index_subscriptions_on_subscribable_and_user_id_and_project_id' } - remove_index :subscriptions, name: 'subscriptions_user_id_and_ref_fields' if index_name_exists?(:subscriptions, 'subscriptions_user_id_and_ref_fields', false) + remove_index :subscriptions, name: 'subscriptions_user_id_and_ref_fields' if index_name_exists?(:subscriptions, 'subscriptions_user_id_and_ref_fields') end def down add_concurrent_index :subscriptions, [:subscribable_id, :subscribable_type, :user_id], { unique: true, name: 'subscriptions_user_id_and_ref_fields' } - remove_index :subscriptions, name: 'index_subscriptions_on_subscribable_and_user_id_and_project_id' if index_name_exists?(:subscriptions, 'index_subscriptions_on_subscribable_and_user_id_and_project_id', false) + remove_index :subscriptions, name: 'index_subscriptions_on_subscribable_and_user_id_and_project_id' if index_name_exists?(:subscriptions, 'index_subscriptions_on_subscribable_and_user_id_and_project_id') end end |