Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.		2022-05-11 09:37:48 +02:00
..
exports	Fix test-related issues (#17888)	2022-03-28 12:43:58 +02:00
preferences
two_factor_authentication	Fix typo in source setted->set (#18385)	2022-05-10 04:58:04 +02:00
applications_controller_spec.rb
deletes_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
exports_controller_spec.rb
featured_tags_controller_spec.rb
flavours_controller_spec.rb
imports_controller_spec.rb	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
migrations_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
profiles_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
sessions_controller_spec.rb
two_factor_authentication_methods_controller_spec.rb