about summary refs log tree commit diff
path: root/db/migrate/20181024224956_migrate_account_conversations.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-03-19 02:45:34 +0100
committerGitHub <noreply@github.com>2021-03-19 02:45:34 +0100
commitb3582298341e32528929c6f3292e36a6fa261ba5 (patch)
treec98c19b47de969cbd9f3b3f29bb22ba41eb04cae /db/migrate/20181024224956_migrate_account_conversations.rb
parent55ac2b9c6085def9e692fa69b849239c1249d9fd (diff)
Further preparation for Rails 6 (#15916)
* Use ActiveRecord::Result#to_ary instead of deprecated to_hash

They do the same thing, and to_hash has been removed from Rails 6.1

* Explicitly name polymorphic indexes to workaround a bug in Rails 6.1

cf. https://github.com/rails/rails/issues/41693

* Fix incorrect usage of “foreign_key” in migration script

* Use `ActiveModel::Errors#delete` instead of deprecated clear method

* Fix link headers tests on Rails 6.1

Rails 6.1 adds values to the Link header by default, thus it is not a
LinkHeader object anymore. Fix the test to parse the Link header instead
of assuming it is a LinkHeader.
Diffstat (limited to 'db/migrate/20181024224956_migrate_account_conversations.rb')
-rw-r--r--db/migrate/20181024224956_migrate_account_conversations.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/db/migrate/20181024224956_migrate_account_conversations.rb b/db/migrate/20181024224956_migrate_account_conversations.rb
index 12e0a70fa..9e6497d81 100644
--- a/db/migrate/20181024224956_migrate_account_conversations.rb
+++ b/db/migrate/20181024224956_migrate_account_conversations.rb
@@ -17,8 +17,8 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2]
     belongs_to :account, optional: true
     belongs_to :activity, polymorphic: true, optional: true
 
-    belongs_to :status,         foreign_type: 'Status',        foreign_key: 'activity_id', optional: true
-    belongs_to :mention,        foreign_type: 'Mention',       foreign_key: 'activity_id', optional: true
+    belongs_to :status,  foreign_key: 'activity_id', optional: true
+    belongs_to :mention, foreign_key: 'activity_id', optional: true
 
     def target_status
       mention&.status