diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-20 13:54:00 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-20 13:54:00 +0100 |
commit | 1d6152f4404d40a6113bad2e70326fb5c2145ef4 (patch) | |
tree | 4edcc500883b3e533c06517b147bf221b06f6bf0 /app/models/concerns/account_associations.rb | |
parent | b9a998f201913dd1c89ddcb0c4c9e181eb73bfcf (diff) | |
parent | 158c31b9df538691666e5b91f48a0afecd2985fe (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.
Diffstat (limited to 'app/models/concerns/account_associations.rb')
-rw-r--r-- | app/models/concerns/account_associations.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb index 1b22f750c..ecccaf35e 100644 --- a/app/models/concerns/account_associations.rb +++ b/app/models/concerns/account_associations.rb @@ -7,6 +7,9 @@ module AccountAssociations # Local users has_one :user, inverse_of: :account, dependent: :destroy + # Identity proofs + has_many :identity_proofs, class_name: 'AccountIdentityProof', dependent: :destroy, inverse_of: :account + # Timelines has_many :stream_entries, inverse_of: :account, dependent: :destroy has_many :statuses, inverse_of: :account, dependent: :destroy |