Merge commit 'b7902225d6' into glitch-soc/merge-upstream

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.
This commit is contained in:
Claire 2024-05-04 16:28:30 +02:00
commit 3789d9f825
49 changed files with 911 additions and 205 deletions

View file

@ -1,7 +1,7 @@
{
"name": "@mastodon/mastodon",
"license": "AGPL-3.0-or-later",
"packageManager": "yarn@4.1.1",
"packageManager": "yarn@4.2.1",
"engines": {
"node": ">=18"
},