coffey-labs/mastodon
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity Sponsor

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
Conversation 0 Commits 2 Files Changed 146
+2408 -312
jcoffey-dev commented 2026-10-29 15:12:39 +00:00
Owner
Copy link
Copy source

Imports upstream v4.7.4 (security release: GHSA-288h-6j8h-6x5j, ActivityPub identifier verification; sign-in challenge e-mail after long inactivity; dependency fixes) onto the upstream branch as one unmodified snapshot (tree 4def230 = upstream tag d04059f), and merges it into main.

  • Upstream's re-touched .github/workflows files stay deleted.
  • Dockerfile: upstream's Ruby 4.0.6 → 4.0.9 bump merges cleanly with our SOURCE_* build args.
  • No migrations, no theme files touched (only mastodon/forms.scss).
  • Diff scanned for hidden Unicode / AI-addressed text: clean (only Persian ZWNJ and a stray ZWSP pair in an Irish locale string).

After merge: tag v4.7.4-coffeylabs.1.

Imports upstream v4.7.4 (security release: GHSA-288h-6j8h-6x5j, ActivityPub identifier verification; sign-in challenge e-mail after long inactivity; dependency fixes) onto the `upstream` branch as one unmodified snapshot (tree 4def230 = upstream tag d04059f), and merges it into main. - Upstream's re-touched `.github/workflows` files stay deleted. - Dockerfile: upstream's Ruby 4.0.6 → 4.0.9 bump merges cleanly with our SOURCE_* build args. - No migrations, no theme files touched (only `mastodon/forms.scss`). - Diff scanned for hidden Unicode / AI-addressed text: clean (only Persian ZWNJ and a stray ZWSP pair in an Irish locale string). After merge: tag `v4.7.4-coffeylabs.1`.
jcoffey-dev added 2 commits 2026-10-29 15:12:39 +00:00
Import Mastodon v4.7.4
Chromatic / Check for relevant changes (push) Canceled after 0s
Details
Chromatic / Run Chromatic (push) Canceled after 0s
Details
4dfbb64241 
Snapshot of upstream tag v4.7.4 (commit d04059fc80be5cbba6b4dd5a8b94d63ffff09f2c) from
https://github.com/mastodon/mastodon, unmodified.
Merge Mastodon v4.7.4
ci / publish (pull_request) Skipped
Details
ci / docker-build (pull_request) Successful in 14m30s
Details
c5348c4787 
# Conflicts:
#	.github/workflows/bundler-audit.yml
#	.github/workflows/lint-haml.yml
#	.github/workflows/lint-ruby.yml
jcoffey-dev merged commit e5ab841e18 into main 2026-10-29 15:31:07 +00:00
jcoffey-dev deleted branch import-v4.7.4 2026-10-29 15:31:08 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something isn't working
 dependencies
Dependency updates
 documentation
Docs, README or site copy
 duplicate
Already tracked elsewhere
 enhancement
New feature or improvement
 good first issue
Good for newcomers
 help wanted
Contributions welcome
 invalid
Not a valid issue
 needs info
Waiting on the reporter for details
 question
Needs an answer, not a code change
 security
Security issue or hardening
 translation
New language or translation fixes
 wontfix
Will not be worked on
priority
p1
High priority
priority
p2
Medium priority
priority
p3
Low priority
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
jcoffey-dev (John Coffey)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: coffey-labs/mastodon#3