Merge Mastodon v4.7.4 #3

Merged
jcoffey-dev merged 2 commits from import-v4.7.4 into main 2026-10-29 15:31:07 +00:00
2 Commits
Author SHA1 Message Date
jcoffey-dev c5348c4787 Merge Mastodon v4.7.4
ci / publish (pull_request) Skipped
ci / docker-build (pull_request) Successful in 14m30s
# Conflicts:
#	.github/workflows/bundler-audit.yml
#	.github/workflows/lint-haml.yml
#	.github/workflows/lint-ruby.yml
2026-10-29 08:12:07 -07:00
jcoffey-dev 4dfbb64241 Import Mastodon v4.7.4
Chromatic / Check for relevant changes (push) Canceled after 0s
Chromatic / Run Chromatic (push) Canceled after 0s
Snapshot of upstream tag v4.7.4 (commit d04059fc80be5cbba6b4dd5a8b94d63ffff09f2c) from
https://github.com/mastodon/mastodon, unmodified.
2026-10-29 08:11:58 -07:00