Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		2019-04-10 09:16:08 +02: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	Add support for IPv6 only MXes in Email validation (#10009)	2019-02-12 14:48:04 +01:00
follow_limit_validator_spec.rb	Add specs for FollowLimitValidator (#9655)	2018-12-29 08:24:52 +01:00
poll_validator_spec.rb	Allow set the voting period to just 5 minutes (#10525)	2019-04-09 17:02:12 +02: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