Merge pull request #2291 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream

Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes.

Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream

Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.

Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream

Change label and design of sensitive and unavailable media in web UI (#25712)

Fix dropdowns being disabled for logged out users in web UI (#25714)

Convert `<DismissableBanner>` to Typescript (#25582)

Rewrite `<ShortNumber />` as FC and TS (#25492)

simplify counters (#25541)

Fix translate button position (#25807)

Merge pull request #2272 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Merge branch 'main' into glitch-soc/merge-upstream

Add button to see results for polls in web UI (#25726)

Add at-symbol prepended to mention span title (#25684)

Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>

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)

Rewrite `<AutosuggestHashtag />` as FC and TS (#25481)

Merge pull request #2251 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes