Conflicts: - `.rubocop_todo.yml`: Glitch-soc had different overrides, but upstream simply disabled the rules. Disabled them as well. - `app/serializers/initial_state_serializer.rb`: Not really a conflict, again because of a rubocop comment.
SKIP_POST_DEPLOYMENT_MIGRATIONS
config_for
x.mastodon
Style/FormatStringToken
ENV.fetch
rails
debug?
OAuth
rack
/health
Style/PreferredHashMethods