Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.

2020-11-20 13:27:48 +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

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

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

applications_controller_spec.rb

…

deletes_controller_spec.rb

Refactor settings controllers (#14767)

2020-09-11 20:56:35 +02: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

…

identity_proofs_controller_spec.rb

Add ability to remove identity proofs from account (#13682)

2020-05-10 11:21:10 +02:00

imports_controller_spec.rb

…

migrations_controller_spec.rb

Add account migration UI (#11846)

2019-09-19 20:58:19 +02:00

profiles_controller_spec.rb

…

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