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

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream updated `docker/build-push-action`, and we a different config
  for `docker/metadata-action` so the lines directly above were different,
  but it's not a real conflict.
  Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Upstream changed the codestyle near a line we had modified to accommodate
  configurable character count.
  Kept our change.

1 files changed, 1 insertions, 0 deletions

diff --git a/config/locales/devise.csb.yml b/config/locales/devise.csb.yml
new file mode 100644
index 000000000..0de706e41
--- /dev/null
+++ b/config/locales/devise.csb.yml
@@ -0,0 +1 @@
+csb: