You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		4 years ago
..
exports	Export and import show_reblogs together with following list (#10495)	6 years ago
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	6 years ago
two_factor_authentication	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
applications_controller_spec.rb	lint pass 2 (#8878)	6 years ago
deletes_controller_spec.rb	Change unconfirmed user login behaviour (#11375)	5 years ago
exports_controller_spec.rb	Add spec for Settings::ExportsController#create (#9512)	6 years ago
featured_tags_controller_spec.rb	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)	5 years ago
flavours_controller_spec.rb	Thank you, Officer Murphy	7 years ago
identity_proofs_controller_spec.rb	Add ability to remove identity proofs from account (#13682)	5 years ago
imports_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
migrations_controller_spec.rb	Add account migration UI (#11846)	5 years ago
profiles_controller_spec.rb	Error message for avatar image that's too large. #9204 (#9518)	6 years ago
sessions_controller_spec.rb	Add missing tests for sessions controller (#7744)	7 years ago
two_factor_authentication_methods_controller_spec.rb	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago