Claire f5b7307890 Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream ...

Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines.

2023-12-21 19:24:10 +01:00

..

exports

…

migration

…

preferences

…

two_factor_authentication

…

aliases_controller_spec.rb

…

applications_controller_spec.rb

…

deletes_controller_spec.rb

…

exports_controller_spec.rb

…

featured_tags_controller_spec.rb

…

flavours_controller_spec.rb

…

imports_controller_spec.rb

…

login_activities_controller_spec.rb

…

migrations_controller_spec.rb

…

pictures_controller_spec.rb

…

privacy_controller_spec.rb

…

profiles_controller_spec.rb

…

sessions_controller_spec.rb

…

two_factor_authentication_methods_controller_spec.rb

…

verifications_controller_spec.rb

…