Claire 3d25fe0426 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.

2022-02-23 18:13:12 +01:00

..

exports

Add import/export feature for bookmarks (#14956)

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

preferences

Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)

2019-06-07 16:51:08 +02:00

two_factor_authentication

Fix various typos (#17621)

2022-02-22 20:14:17 +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

Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)

2019-12-17 13:31:56 +01:00

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