tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Keybase integration (#17045)

Browse Source
This commit is contained in:
Eugen Rochko
2021-11-26 05:58:18 +01:00
committed by GitHub
parent 12b3ff6c6d
commit 7de0ee7aba
43 changed files with 25 additions and 1215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/concerns/account_associations.rb
View File

@@ -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

2
app/models/concerns/account_merging.rb
View File

@@ -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
]