Thibaut Girka fcce135d27 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.		2019-03-26 16:01:59 +01:00
..
blacklisted_email_validator.rb
disallowed_hashtags_validator.rb	Add specs for DisallowedHashtagsValidator (#9653)	2018-12-29 07:22:51 +01:00
email_mx_validator.rb	Add support for IPv6 only MXes in Email validation (#10009)	2019-02-12 14:48:04 +01:00
existing_username_validator.rb	Add validations to admin settings (#10348)	2019-03-23 14:07:04 +01:00
follow_limit_validator.rb	Fix follow limit validator reporting lower number past threshold (#9230)	2018-11-08 21:06:01 +01:00
html_validator.rb	Add validations to admin settings (#10348)	2019-03-23 14:07:04 +01:00
note_length_validator.rb
poll_validator.rb	Fix poll validation issues (#10186)	2019-03-06 04:54:11 +01:00
status_length_validator.rb
status_pin_validator.rb
unique_username_validator.rb
unreserved_username_validator.rb
url_validator.rb
vote_validator.rb	Fix vote validation for polls with multiple choices (#10138)	2019-03-03 23:41:30 +01:00