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 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.		6 years ago
..
blacklisted_email_validator.rb	Implement EmailBlackList (#5109)	7 years ago
disallowed_hashtags_validator.rb	Implement the ability for instances to define a list of disallowed hashtags (#7176)	7 years ago
email_mx_validator.rb	Improve e-mail MX validator and add tests (#9489)	6 years ago
follow_limit_validator.rb	Fix follow limit validator reporting lower number past threshold (#9230)	6 years ago
status_length_validator.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
status_pin_validator.rb	Allow more than the max pins if account is not local (#7105)	7 years ago
unique_username_validator.rb	Fix UniqueUsernameValidator comparison (#6926)	7 years ago
unreserved_username_validator.rb	pam authentication (#5303)	7 years ago
url_validator.rb	Punycode URI normalization (#2370)	8 years ago