diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-11-26 22:53:55 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-11-26 22:53:55 +0100 |
commit | 9b861d56a9646e75caf1f7d60fa9eade566d3740 (patch) | |
tree | a45059ea258e035c6f63e966973629b9cd0766b8 /app/services/delete_account_service.rb | |
parent | 97151840b02499a0cec1360907a6b86a1df02b3b (diff) | |
parent | 1c826471e7d964f0fdb2dc2b89dcd5a19c017538 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.
Diffstat (limited to 'app/services/delete_account_service.rb')
-rw-r--r-- | app/services/delete_account_service.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb index ac571d7e2..0e3fedfe7 100644 --- a/app/services/delete_account_service.rb +++ b/app/services/delete_account_service.rb @@ -17,7 +17,6 @@ class DeleteAccountService < BaseService domain_blocks featured_tags follow_requests - identity_proofs list_accounts migrations mute_relationships @@ -45,7 +44,6 @@ class DeleteAccountService < BaseService domain_blocks featured_tags follow_requests - identity_proofs list_accounts migrations mute_relationships |