about summary refs log tree commit diff
path: root/db/migrate
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-01-04 23:17:11 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-01-04 23:17:11 +0000
commitc69a23ae4668bad91e3992dbd72e7b3a62427bf9 (patch)
treefc8e594f6f9ecc1dd5cb13c491aa17c372adb587 /db/migrate
parentfc884d015a1a2d6c31976af3d63039390fa15939 (diff)
parentd872902997c29e228001b71a4a3ede589e346f5d (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'db/migrate')
-rw-r--r--db/migrate/20171129172043_add_index_on_stream_entries.rb3
-rw-r--r--db/migrate/20171226094803_more_faster_index_on_notifications.rb3
2 files changed, 4 insertions, 2 deletions
diff --git a/db/migrate/20171129172043_add_index_on_stream_entries.rb b/db/migrate/20171129172043_add_index_on_stream_entries.rb
index 478530c7f..181c4f288 100644
--- a/db/migrate/20171129172043_add_index_on_stream_entries.rb
+++ b/db/migrate/20171129172043_add_index_on_stream_entries.rb
@@ -1,6 +1,7 @@
 class AddIndexOnStreamEntries < ActiveRecord::Migration[5.1]
+  disable_ddl_transaction!
+
   def change
-    commit_db_transaction
     add_index :stream_entries, [:account_id, :activity_type, :id], algorithm: :concurrently
     remove_index :stream_entries, name: :index_stream_entries_on_account_id
   end
diff --git a/db/migrate/20171226094803_more_faster_index_on_notifications.rb b/db/migrate/20171226094803_more_faster_index_on_notifications.rb
index b2e53b82d..0273a4e7c 100644
--- a/db/migrate/20171226094803_more_faster_index_on_notifications.rb
+++ b/db/migrate/20171226094803_more_faster_index_on_notifications.rb
@@ -1,6 +1,7 @@
 class MoreFasterIndexOnNotifications < ActiveRecord::Migration[5.1]
+  disable_ddl_transaction!
+
   def change
-    commit_db_transaction
     add_index :notifications, [:account_id, :id], order: { id: :desc }, algorithm: :concurrently
     remove_index :notifications, name: :index_notifications_on_id_and_account_id_and_activity_type
   end