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

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

simplify counters (#25541)

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

Merge upstream changes

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

Add canonical link tags in web UI (#25715)

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

Merge upstream changes

Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream

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

Merge upstream changes

Change "bot" label to "automated" (#25356)

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.

Change design of dropdowns in web UI (#25107)

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

Merge upstream changes

Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted.

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.

Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream

Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream

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

Merge upstream changes up to e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3

Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream

Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.

Change share action from being in action bar to being in dropdown in web UI (#25105)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>