Claire b2915613fb Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream.		2022-01-28 08:58:32 +01:00
..
exports
preferences
two_factor_authentication
applications_controller_spec.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
deletes_controller_spec.rb
exports_controller_spec.rb
featured_tags_controller_spec.rb
flavours_controller_spec.rb	Thank you, Officer Murphy	2018-01-10 12:10:43 -06:00
imports_controller_spec.rb	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
migrations_controller_spec.rb
profiles_controller_spec.rb
sessions_controller_spec.rb	Add missing tests for sessions controller (#7744)	2018-06-06 10:23:22 +09:00
two_factor_authentication_methods_controller_spec.rb	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00