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.
mastodon/app/validators
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
..
blacklisted_email_validator.rb
disallowed_hashtags_validator.rb Implement the ability for instances to define a list of disallowed hashtags (#7176) 2018-04-23 23:52:58 +02:00
email_mx_validator.rb Improve e-mail MX validator and add tests (#9489) 2018-12-10 22:53:25 +01:00
follow_limit_validator.rb Fix follow limit validator reporting lower number past threshold (#9230) 2018-11-08 21:06:01 +01:00
status_length_validator.rb
status_pin_validator.rb
unique_username_validator.rb
unreserved_username_validator.rb
url_validator.rb