Claire d7d102e68f Merge commit 'e24737c612730fd865f62905484dbfa25b82d27e' into glitch-soc/merge-upstream ...

Conflicts:
- `.prettierignore`:
  Upstream removed it, replaced by `.oxfmtrc.json`.
  We had glitch-specific files in there.
  Updated `.oxfmtrc.json` accordingly and removed `.prettierignore`.
- `config/formatjs-formatter.js`:
  Upstream switched to `oxfmt` from `prettier`, and some rules are slightly different.
  Glitch-soc had extra code in there.
  Reformatted appropriately.
- `eslint.config.mjs`:
  Upstream moved some configuration from `eslint.config.mjs` to `.oxfmtrc.json` where
  glitch-soc had slightly different configuration.
  Removed it from `eslint.config.mjs` as well and updated `.oxfmtrc.json` accordingly.
- `package.json`:
  Upstream changed script definitions textually adjacent to one that we have modified.
  Applied upstream's change, keeping the textually adjacent modified script intact.

2026-02-20 20:32:58 +01:00

..

.well-known

chore: validate the project funding.json association (#35221)

2025-06-30 16:21:52 +00:00

actions

Update actions/cache action to v5 (#37781)

2026-02-09 14:11:06 +00:00

ISSUE_TEMPLATE

Remove the "to triage" label status (#35394)

2025-07-16 07:17:21 +00:00

workflows

Merge commit 'e24737c612730fd865f62905484dbfa25b82d27e' into glitch-soc/merge-upstream

2026-02-20 20:32:58 +01:00

codecov.yml

Second attempt at disabling Codecov annotations (#31841)

2024-09-10 14:00:23 +00:00

renovate.json5

Use separate rules with same groupName for playwright updates (#37809)

2026-02-17 17:49:19 +00:00

stale.yml

Change stale bot to only touch pull requests over 120 days old (#12217)

2019-10-26 12:45:52 +02:00