Merge remote-tracking branch 'origin/master' into gs-master

2017-11-28 11:45:13 -06:00
parent 7463d80ff4 15fab79cfa
commit 95c270f5b1
56 changed files with 867 additions and 77 deletions
--- a/db/migrate/20171028221157_add_reblogs_to_follows.rb
+++ b/db/migrate/20171028221157_add_reblogs_to_follows.rb
@@ -3,9 +3,7 @@ require Rails.root.join('lib', 'mastodon', 'migration_helpers')
 class AddReblogsToFollows < ActiveRecord::Migration[5.1]
  include Mastodon::MigrationHelpers

-  safety_assured do
-    disable_ddl_transaction!
-  end
+  disable_ddl_transaction!

  def up
    safety_assured do