Convert `<DismissableBanner>` to Typescript (#25582)
Rewrite `<ShortNumber />` as FC and TS (#25492)
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.
Add onboarding prompt when home feed too slow in web UI (#25267)
Fix j/k keyboard shortcuts on some status lists (#25554)
Merge pull request #2251 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Rewrite `<LoadingIndicator/>` as FC and TS (#25364)
Merge pull request #2246 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
Rewrite `<LoadMore />` as FC and TS (#25259)
Add data-nosnippet so Google doesn't use trending posts in snippets for / (#25279)
Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream
Conflicts:
- `.eslintrc.js`:
Upstream moved a configuration block in which we had added a glitch-only
path.
Moved the configuration block as upstream did.
- other files:
Upstream reordered imports, and those files had different ones.
Kept our version and reordered imports using the same rules.