catstodon/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 Implement EmailBlackList (#5109) 2017-10-04 15:16:10 +02:00
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 Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
status_pin_validator.rb Allow more than the max pins if account is not local (#7105) 2018-04-12 20:36:02 +02:00
unique_username_validator.rb Fix UniqueUsernameValidator comparison (#6926) 2018-03-27 04:33:57 +02:00
unreserved_username_validator.rb pam authentication (#5303) 2018-02-02 10:18:55 +01:00
url_validator.rb Punycode URI normalization (#2370) 2017-04-25 02:47:31 +02:00