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

Add import/export feature for bookmarks (#14956)

2020-11-19 17:48:13 +01:00

preferences

…

two_factor_authentication

Update Mastodon to Rails 6.1 (#15910)

2021-03-24 10:44:31 +01: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

Add WebAuthn as an alternative 2FA method (#14466)

2020-08-24 16:46:27 +02:00