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.		2019-01-10 21:00:30 +01:00
..
blacklisted_email_validator_spec.rb	Add specs for BlackListedEmailValidator (#9651)	2018-12-29 07:23:44 +01:00
disallowed_hashtags_validator_spec.rb	Add specs for DisallowedHashtagsValidator (#9653)	2018-12-29 07:22:51 +01:00
email_mx_validator_spec.rb	Improve e-mail MX validator and add tests (#9489)	2018-12-10 22:53:25 +01:00
follow_limit_validator_spec.rb	Add specs for FollowLimitValidator (#9655)	2018-12-29 08:24:52 +01:00
status_length_validator_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
status_pin_validator_spec.rb	Add specs for StatusPinValidator (#9648)	2018-12-28 18:09:32 +09:00
unique_username_validator_spec.rb	Remove pending spec (#9454)	2018-12-07 16:38:50 +01:00
unreserved_username_validator_spec.rb	Add specs for UnreservedUsernameValidator (#9698)	2019-01-03 13:10:02 +09:00
url_validator_spec.rb	Add specs for UrlValidator (#9699)	2019-01-03 13:10:20 +09:00