Conflicts: - `spec/system/settings/preferences/appearance_spec.rb`: Upstream tests for changing themes in there, but glitch-soc has its own place for that. Updated upstream's change while skipping the theme test.
expect
Admin::ExportControllerConcern
HTTP::*
config_for
controllers/concerns
have_http_link_header
Account#unavailable?
Account#permanently_unavailable?
Style/SafeNavigation
lang
cache_*
preload_*
OpenSSL::SSL::SSLError