mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	65e994b29b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.	7 years ago
Eugen Rochko	dbb1ee269f	Improve e-mail MX validator and add tests (#9489 )	7 years ago
Thibaut Girka	e7f1bfdc2d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.	7 years ago
ysksn	57bb62d5cf	Remove pending spec (#9454 ) Since dots are not allowed in username, this spec is no longer needed.	7 years ago
David Yip	d2cdc2b5a3	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
unarist	a1d0915585	Add a spec for UniqueUsernameValidator (#6927 ) Note that this spec has a pending test about dots in the username, because allowing it has been reverted for now.	8 years ago
aschmitz	e18ed4bbc7	Fix StatusLengthValidator tests This fixes the StatusLengthValidator tests to use StatusLengthValidator::MAX_CHARS to derive the length of the strings tested, and so makes them resilient to changes in MAX_CHARS (such as the one that made these tests fail, with it being changed from 500 to 512). This seems a bit odd for some types of tests, but appears to make sense here, where the testing goes beyond `status.length > MAX_CHARS`.	9 years ago
Eugen Rochko	53b2b1b238	Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427 ) * Count all URLs in text as 23 characters flat, do not count domain part of usernames * Add new status text counting logic to web UI	9 years ago

8 Commits (9e04b2e8a4fa6cb45f59000faf2902a727973add)