Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream

Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.
This commit is contained in:
Claire
2025-06-24 22:43:43 +02:00
150 changed files with 1600 additions and 1232 deletions

View File

@@ -175,6 +175,8 @@
"globals": "^16.0.0",
"husky": "^9.0.11",
"lint-staged": "^16.0.0",
"msw": "^2.10.2",
"msw-storybook-addon": "^2.0.5",
"playwright": "^1.52.0",
"prettier": "^3.3.3",
"react-test-renderer": "^18.2.0",
@@ -205,5 +207,10 @@
"react-router-dom": {
"optional": true
}
},
"msw": {
"workerDirectory": [
".storybook/static"
]
}
}