diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2021-11-26 05:58:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-26 05:58:18 +0100 |
| commit | 7de0ee7aba86cffeaeffded7e0699214fb64364e (patch) | |
| tree | 117d92cf2099a0b4c9b8e730ef18be80dc0e6f9a /app/models/concerns | |
| parent | 12b3ff6c6d70df1ce34f4b103b519250c9e2d2c8 (diff) | |
Remove Keybase integration (#17045)
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/account_associations.rb | 3 | ||||
| -rw-r--r-- | app/models/concerns/account_merging.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb index f2a4eae77..f9e7a3bea 100644 --- a/app/models/concerns/account_associations.rb +++ b/app/models/concerns/account_associations.rb @@ -7,8 +7,7 @@ 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 + # E2EE has_many :devices, dependent: :destroy, inverse_of: :account # Timelines diff --git a/app/models/concerns/account_merging.rb b/app/models/concerns/account_merging.rb index 8d37c6e56..119773e6b 100644 --- a/app/models/concerns/account_merging.rb +++ b/app/models/concerns/account_merging.rb @@ -13,7 +13,7 @@ module AccountMerging owned_classes = [ Status, StatusPin, MediaAttachment, Poll, Report, Tombstone, Favourite, - Follow, FollowRequest, Block, Mute, AccountIdentityProof, + Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin, AccountStat, ListAccount, PollVote, Mention, AccountDeletionRequest, AccountNote, FollowRecommendationSuppression ] |