Claire 9b861d56a9 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.		2021-11-26 22:53:55 +01:00
..
activitypub	…
concerns	…
keys	…
account_search_service.rb	…
account_statuses_cleanup_service.rb	…
after_block_domain_from_account_service.rb	…
after_block_service.rb	…
after_unallow_domain_service.rb	…
app_sign_up_service.rb	…
authorize_follow_service.rb	…
backup_service.rb	…
base_service.rb	…
batched_remove_status_service.rb	…
block_domain_service.rb	…
block_service.rb	…
bootstrap_timeline_service.rb	…
clear_domain_media_service.rb	…
delete_account_service.rb	…
deliver_to_device_service.rb	…
fan_out_on_write_service.rb	…
favourite_service.rb	…
fetch_link_card_service.rb	…
fetch_oembed_service.rb	…
fetch_remote_status_service.rb	…
fetch_resource_service.rb	…
follow_service.rb	…
import_service.rb	…
move_service.rb	…
mute_service.rb	…
notify_service.rb	…
post_status_service.rb	…
precompute_feed_service.rb	…
process_hashtags_service.rb	…
process_mentions_service.rb	…
reblog_service.rb	…
reject_follow_service.rb	…
remove_from_followers_service.rb	…
remove_status_service.rb	…
report_service.rb	…
resolve_account_service.rb	…
resolve_url_service.rb	…
search_service.rb	…
suspend_account_service.rb	…
tag_search_service.rb	…
unallow_domain_service.rb	…
unblock_domain_service.rb	…
unblock_service.rb	…
unfavourite_service.rb	…
unfollow_service.rb	…
unmute_service.rb	…
unsuspend_account_service.rb	…
update_account_service.rb	…
verify_link_service.rb	…
vote_service.rb	…