Merge pull request #2251 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
Migrate to request specs in `/api/v1/lists` (#25443)
Migrate to request specs in `/api/v1/domain_blocks` (#25414)
Migrate to request specs in `/api/v1/follow_requests` (#25411)
Migrate to request specs in `/api/v1/apps/verify_credentials` (#25404)
Extract shared examples from api specs (#25387)
Fix ArgumentError when loading newer Private Mentions (#25399)
Merge pull request #2246 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Reduce `RSpec/MultipleExpectations` cop max to 8 (#25313)
migrate test for `GET /api/v1/accounts/{account_id}` to request spec (#25322)
Migrate to request specs in `/api/v1/admin/domain_blocks` (#25335)
Migrate to request specs in `/api/v1/admin/reports` (#25355)
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
Fix RSpec/MissingExampleGroupArgument cop (#25310)
Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes