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.

Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		6 years ago
..
blacklisted_email_validator.rb	Implement EmailBlackList (#5109)	7 years ago
disallowed_hashtags_validator.rb	Implement the ability for instances to define a list of disallowed hashtags (#7176)	6 years ago
email_mx_validator.rb	Call address instead of exchange (#8076)	6 years ago
follow_limit_validator.rb	Limit the number of people that can be followed from one account (#8807)	6 years ago
status_length_validator.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
status_pin_validator.rb	Allow more than the max pins if account is not local (#7105)	6 years ago
unique_username_validator.rb	Fix UniqueUsernameValidator comparison (#6926)	6 years ago
unreserved_username_validator.rb	pam authentication (#5303)	6 years ago
url_validator.rb	Punycode URI normalization (#2370)	7 years ago