Conflicts: - `spec/controllers/application_controller_spec.rb`: Upstream moved specs that were textually-adjacent to glitch-soc ones. Kept the glitch-soc ones.
tootctl email-domain-blocks
LOCAL_DOMAIN
exclude_direct
/api/v1/accounts/:id/statuses
DeliveryFailureTracker
missing_attribution
TagManager#normalize_domain
Style/GuardClause
Webfinger