mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-15 07:34:58 +01:00
Code Issues Projects Releases Wiki Activity
d4f315f304
mastodon/spec/controllers/settings
History
Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
2021-11-26 22:53:55 +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 Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
applications_controller_spec.rb lint pass 2 (#8878) 2018-10-04 17:38:04 +02:00
deletes_controller_spec.rb Fix user email address being banned on self-deletion (#16503) 2021-07-14 05:35:49 +02:00
exports_controller_spec.rb Add spec for Settings::ExportsController#create (#9512) 2018-12-13 02:53:52 +01:00
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 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 Fix race conditions on account migration creation (#15597) 2021-02-02 14:49:57 +01:00
profiles_controller_spec.rb Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
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