Conflicts: - `config/settings.yml`: Not a real conflict, upstream removed settings that are identical in glitch-soc but textually adjacent to glitch-soc-only settings. Removed what upstream removed.
SKIP_POST_DEPLOYMENT_MIGRATIONS
config_for
x.mastodon
Style/FormatStringToken
ENV.fetch
rails
OAuth
rack
/health
Style/PreferredHashMethods