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 a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		6 years ago
..
blacklisted_email_validator_spec.rb	Add specs for BlackListedEmailValidator (#9651)	6 years ago
disallowed_hashtags_validator_spec.rb	…
email_mx_validator_spec.rb	…
follow_limit_validator_spec.rb	Add specs for FollowLimitValidator (#9655)	6 years ago
status_length_validator_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
status_pin_validator_spec.rb	…
unique_username_validator_spec.rb	…
unreserved_username_validator_spec.rb	Add specs for UnreservedUsernameValidator (#9698)	6 years ago
url_validator_spec.rb	Add specs for UrlValidator (#9699)	6 years ago