David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		2018-02-04 16:36:19 -06:00
..
blacklisted_email_validator.rb	Implement EmailBlackList (#5109)	2017-10-04 15:16:10 +02: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	Limit users to 50 lists, remove pagination from lists API (#5933)	2017-12-09 01:32:29 +01: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