Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did.
Settings::
settings/2fa/webauthn
fake!
inline!
settings/featured_tags/index
RSpec/LetSetup
spec/controllers
settings/privacy
settings/verifications