Merge branch 'master' into feature-circles

2021-01-05 23:46:40 +09:00 · 2021-01-05 23:46:40 +09:00 · 824d1b8893
commit 824d1b8893
parent 6358072bc0 c747883dc8
906 changed files with 37100 additions and 11600 deletions
--- a/app/models/concerns/account_associations.rb
+++ b/app/models/concerns/account_associations.rb
@ -63,5 +63,8 @@ module AccountAssociations
    # Hashtags
    has_and_belongs_to_many :tags
    has_many :featured_tags, -> { includes(:tag) }, dependent: :destroy, inverse_of: :account
+
+    # Account deletion requests
+    has_one :deletion_request, class_name: 'AccountDeletionRequest', inverse_of: :account, dependent: :destroy
  end
 end