diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-23 15:23:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 15:23:12 +0100 |
| commit | 8a3e4a48838405a7a78f2b46cc2b2a7c8fa412fa (patch) | |
| tree | b5d7908956cab9d18dceda381e18cdb4a6e0e4ba /app/models/concerns | |
| parent | 1a3088364fe602bb48647d78dda440b174424e17 (diff) | |
| parent | cb98e7dbd35c730a58f65112c3fa32ee180a2518 (diff) | |
Merge pull request #871 from ThibG/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, 2 insertions, 0 deletions
diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb index 38e2481c5..de7f3d525 100644 --- a/app/models/concerns/account_associations.rb +++ b/app/models/concerns/account_associations.rb @@ -40,6 +40,8 @@ module AccountAssociations # Moderation notes 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 # Lists (that the account is on, not owned by the account) has_many :list_accounts, inverse_of: :account, dependent: :destroy |