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.

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		7 years ago
..
blacklisted_email_validator.rb	Implement EmailBlackList (#5109)	7 years ago
status_length_validator.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
status_pin_validator.rb	Limit users to 50 lists, remove pagination from lists API (#5933)	7 years ago
unreserved_username_validator.rb	pam authentication (#5303)	7 years ago
url_validator.rb	Punycode URI normalization (#2370)	8 years ago