diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-19 14:22:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 14:22:59 +0100 |
| commit | b209e919bddb4bb72bb4f8589f4b15654f22ef53 (patch) | |
| tree | ccd980d2d701c03f9c16358908f20560f2d5be2c /app/models/concerns | |
| parent | f6acc039ec95c6d1c8cc2e2955f2af31d27e928c (diff) | |
| parent | c42938aed4677f52207bbb6389c7edc2772a6f7a (diff) | |
Merge pull request #1662 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/account_associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb index f9e7a3bea..bbe269e8f 100644 --- a/app/models/concerns/account_associations.rb +++ b/app/models/concerns/account_associations.rb @@ -42,7 +42,7 @@ module AccountAssociations has_many :account_moderation_notes, dependent: :destroy, inverse_of: :account has_many :targeted_moderation_notes, class_name: 'AccountModerationNote', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account has_many :account_warnings, dependent: :destroy, inverse_of: :account - has_many :targeted_account_warnings, class_name: 'AccountWarning', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account + has_many :strikes, class_name: 'AccountWarning', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account # Lists (that the account is on, not owned by the account) has_many :list_accounts, inverse_of: :account, dependent: :destroy |