Merge pull request #2256 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
Fix verified badge in account lists potentially including rel="me" links (#25561)
Change labels and styles on the onboarding screen in web UI (#25559)
Remove unique accounts condition from Home onboarding prompt (#25556)
Add onboarding prompt when home feed too slow in web UI (#25267)
Add POST /api/v1/conversations/:id/unread (#25509)
Use default `bootsnap/setup` in boot.rb (#25502)
Fix j/k keyboard shortcuts on some status lists (#25554)
Change /api/v1/statuses/:id/history to always return at least one item (#25510)
Fix `RSpec/VerifiedDoubles` cop (#25469)
Reduce `Admin::Reports::Actions` spec db activity (#25465)
Add finer permission requirements for managing webhooks (#25463)
Speed-up on `StatusesController` spec (#25549)