Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream ...

Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.

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

..

build-container-image.yml

Add OpenTelemetry VCS attributes (#32904)

2024-11-18 08:41:09 +00:00

build-nightly.yml

Disable tagging nightly images as latest

2024-08-24 12:32:48 +02:00

build-push-pr.yml

Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream

2024-10-14 19:46:52 +02:00

build-releases.yml

Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream

2024-10-14 19:46:52 +02:00

build-security.yml

Fix discrepancy with upstream regarding latest docker image tag (#2877)

2024-10-08 19:10:59 +02:00

bundler-audit.yml

Update ✨binstub✨ templates (#32335)

2024-11-25 16:49:24 +00:00

check-i18n.yml

Use ubuntu-latest for all GH actions runners (#33473)

2025-01-06 18:24:04 +00:00

codeql.yml

Limit CI push triggers to main and stable-* branches (#30934)

2024-07-07 09:39:31 +00:00

crowdin-download-stable.yml

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

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

crowdin-download.yml

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

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

crowdin-upload.yml

Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream

2024-10-14 19:46:52 +02:00

format-check.yml

Limit CI push triggers to main and stable-* branches (#30934)

2024-07-07 09:39:31 +00:00

haml-lint-problem-matcher.json

Setup haml-lint CI with todo config (#23524)

2023-03-15 04:15:36 +01:00

lint-css.yml

Replace deprecated "github" format for stylelint on CI runs (#33292)

2024-12-14 09:50:08 +00:00

lint-haml.yml

Update ✨binstub✨ templates (#32335)

2024-11-25 16:49:24 +00:00

lint-js.yml

Limit CI push triggers to main and stable-* branches (#30934)

2024-07-07 09:39:31 +00:00

lint-ruby.yml

Use explicit config loading from bin/rubocop (#33256)

2024-12-16 13:50:58 +00:00

rebase-needed.yml

Re-enable PR-needs-rebase action for glitch-soc (was disabled upstream for forks)

2024-08-24 12:33:09 +02:00

test-image-build.yml

Dockerfile rewrite based on Ruby image with performance optimizations and size reduction, dedicated Streaming image (#26850)

2023-11-28 10:04:40 +00:00

test-js.yml

Limit CI push triggers to main and stable-* branches (#30934)

2024-07-07 09:39:31 +00:00

test-migrations.yml

Add explicit migration breakpoints (#33089)

2024-12-05 11:40:30 +00:00

test-ruby.yml

Use ruby version 3.4.1 (#33304)

2025-01-07 13:46:56 +00:00