mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-07 15:32:13 -05:00
Conflicts: - `spec/validators/status_length_validator_spec.rb`: Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS` while glitch-soc had custom code to read from `MAX_TOOT_CHARS`. Switched to using upstream's implementation of the tests.