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 ab5ff638f2 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		5 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 password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
applications_controller_spec.rb	lint pass 2 (#8878)	6 years ago
deletes_controller_spec.rb	Change unconfirmed user login behaviour (#11375)	6 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	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	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_authentications_controller_spec.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago