Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/account.rb`: Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits. Ported upstream's changes. - `yarn.lock`: Dependencies adjacent to glitch-soc-only dependencies updated. Updated them as well.		2024-10-26 13:38:07 +02:00
..
build-container-image.yml	Update docker/build-push-action action to v6 (#31381)	2024-08-13 20:09:38 +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	Limit CI push triggers to main and stable-* branches (#30934)	2024-07-07 09:39:31 +00:00
check-i18n.yml	Update dependency ubuntu to v24 (#32280)	2024-10-21 08:29:23 +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	Fix download of stable translation files in glitch-soc	2024-10-08 13:41:40 +02:00
crowdin-download.yml	Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream	2024-10-06 16:07:58 +02: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	Limit CI push triggers to main and stable-* branches (#30934)	2024-07-07 09:39:31 +00:00
lint-haml.yml	Limit CI push triggers to main and stable-* branches (#30934)	2024-07-07 09:39:31 +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	Limit CI push triggers to main and stable-* branches (#30934)	2024-07-07 09:39:31 +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	Run migration tests against postgres 16 and 17 as well (#32416)	2024-10-16 07:44:28 +00:00
test-ruby.yml	Explicitly install ImageMagick in CI (except for libvips tests) (#32534)	2024-10-16 08:03:35 +00:00