This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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	…
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	Fix user email address being banned on self-deletion (#16503)	2021-07-14 05:35:49 +02: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	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	…
two_factor_authentication_methods_controller_spec.rb	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00