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

Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.		2018-12-15 10:45:53 +01:00
..
email_mx_validator_spec.rb	Improve e-mail MX validator and add tests (#9489)	2018-12-10 22:53:25 +01:00
status_length_validator_spec.rb	Fix StatusLengthValidator tests	2017-09-02 11:37:40 -05:00
unique_username_validator_spec.rb	Remove pending spec (#9454)	2018-12-07 16:38:50 +01:00