Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.

Add type annotation for RelativeTimestamp component (#24749)

Rewrite Icon and IconWithBadge with typescript (#24747)

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

Merge upstream changes

New Crowdin updates (#24678)

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

Fix audio player width in thread view (#24713)

Add eslint-plugin-jsdoc (#24719)

Fix media description not being cleared (#24720)

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

Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.

Add default post text to onboarding flow in web UI (#24705)

Change logo version in header based on screen size in web UI (#24707)

Change label from "For you" to "People" on explore screen in web UI (#24706)

New Crowdin updates (#24617)

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

[Glitch] [Proposal] Make able to write React in Typescript (#2190)

Port 4520e6473afe901005e7ac532317f4b4f1af9ead to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

Add more tips to onboarding flow in web UI (#24646)

Change hashtags and mentions in bios to open in-app in web UI (#24643)

Fix cutting off first letter of hashtag links sometimes in web UI (#24623)

Enable formatjs/prefer-pound-in-plural (#24622)

Add lines to threads in web UI (#24549)

Remove empty Kushubian (csb) local files (#24151)