Claire 706c8bf1a0 Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.

2025-05-25 15:11:58 +02:00

..

actions

Add support for libvips in addition to ImageMagick (#30090)

2024-06-05 19:15:39 +00:00

ISSUE_TEMPLATE

Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream

2025-01-10 20:41:36 +01:00

workflows

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

2025-05-25 14:51:59 +02:00

codecov.yml

Second attempt at disabling Codecov annotations (#31841)

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

renovate.json5

Revert React Spring to 9.7.5 and updates Renovate (#34788)

2025-05-23 12:34:41 +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