diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-04-03 17:21:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-03 17:21:33 +0200 |
commit | 8192b0da7cd1fac38a68eab6746fc7ec74328a77 (patch) | |
tree | 686c30ed5f6c4cfe5f6b4d84e46ff19f7baa6949 /db/migrate/20171107143332_add_memorial_to_accounts.rb | |
parent | cbdb25ab0343603165fc89fd28b07c9ca0f2ae6d (diff) | |
parent | 7b15f4006adb5f8f04d83174532c30eeb78757b0 (diff) |
Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'db/migrate/20171107143332_add_memorial_to_accounts.rb')
-rw-r--r-- | db/migrate/20171107143332_add_memorial_to_accounts.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20171107143332_add_memorial_to_accounts.rb b/db/migrate/20171107143332_add_memorial_to_accounts.rb index f3e012ce8..4fb1216a1 100644 --- a/db/migrate/20171107143332_add_memorial_to_accounts.rb +++ b/db/migrate/20171107143332_add_memorial_to_accounts.rb @@ -1,6 +1,6 @@ require Rails.root.join('lib', 'mastodon', 'migration_helpers') -class AddMemorialToAccounts < ActiveRecord::Migration[5.1] +class AddMemorialToAccounts < ActiveRecord::Migration[5.2] include Mastodon::MigrationHelpers disable_ddl_transaction! |