Skip to content

Merge Mastodon v4.5.0-rc.1 nightly (20251029) into TheConnector#10

Merged
mikehikes merged 83 commits intoforked-mainfrom
merge-v4.5.x-20251029
Oct 30, 2025
Merged

Merge Mastodon v4.5.0-rc.1 nightly (20251029) into TheConnector#10
mikehikes merged 83 commits intoforked-mainfrom
merge-v4.5.x-20251029

Conversation

@mikehikes
Copy link

@mikehikes mikehikes commented Oct 29, 2025

Summary

Merges 81 commits from upstream Mastodon main branch up to v4.5.0-rc.1 (commit 5187708).

All upstream PR checks passed on this commit.

Key Changes

Merge Details

  • Upstream commits: ad9faca..5187708 (81 commits)
  • Target version: 4.5.0-rc.1-theatlsocial-nightly-20251029

Conflict Resolution

  • Locale files: Kept ours (TheConnector customizations preserved)
  • Gemfile.lock: Took upstream, added x86_64-linux platform for Docker builds
  • yarn.lock: Took upstream
  • lib/mastodon/version.rb: Updated to nightly-20251029 with rc.1 prerelease

Testing Notes

Monitor CI/CD for any issues. Common areas to watch:

  • RuboCop compliance
  • TypeScript/ESLint checks
  • RSpec tests
  • Docker builds

🤖 Generated with Claude Code

github-actions bot and others added 30 commits October 17, 2025 08:41
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#36513)
ccac6da 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Change HttpMessageSignature to perform assertions directly on Linzer …
c96e28a 
…objects (mastodon#36510)
@diondiondion
Add new "quick boosting" setting (mastodon#36516)
6dad80e
@ClearlyClaire
Fix relationship not being fetched to evaluate whether to show a quot…
811c1ea 
…e post (mastodon#36517)
@renovate
Update dependency vite-plugin-static-copy to v3.1.4 (mastodon#36480)
1018a4d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency rubyzip to v3.2.0 (mastodon#36472)
950e7be 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency rack-attack to v6.8.0 (mastodon#36471)
612771d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#36520)
82483ed 
Co-authored-by: GitHub Actions <[email protected]>
@bensheldon
Replace ThreadingHelper wait loop with functional CyclicBarrier (mast…
843c43c 
…odon#36508)
@renovate
Update dependency rubocop-performance to v1.26.1 (mastodon#36525)
95be29d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @reduxjs/toolkit to v2.9.1 (mastodon#36515)
0a1111d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency jsdom to v27.0.1 (mastodon#36524)
53e20d5 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ChaosExAnima
Emoji: Swap mode test to an emoji from 16.0 (mastodon#36530)
50dfab3
@ClearlyClaire
Fix position of quote dropdown menu item when “quick boosting” is ena…
97c8cc5 
…bled (mastodon#36528)
@ChaosExAnima
Emoji: Fix unneeded re-renders when StatusContent changes (mastodon#3…
6e2973a 
…6532)
@renovate
Update dependency puma to v7.1.0 (mastodon#36519)
168cba3 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency vite to v7.1.11 (mastodon#36526)
341ea7f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency playwright to v1.55.1 [SECURITY] (mastodon#36534)
74172ce 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Specs for validation error in API responses (mastodon#36507)
2eccd7b
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#36538)
2b9e429 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Merge commit from fork
405a49d 
* Refuse granting quote authorization for reblogs

* Add validation to reject quotes of reblogs

* Do not process quotes of reblogs as potentially valid quotes

* Refuse to serve quoted reblogs over REST API
@ClearlyClaire
Bump version to v4.5.0-beta.2 (mastodon#36543)
118ff13
@renchap
Drop support for PostgreSQL 13 (mastodon#36540)
b80ec37
@renchap
Update recommended Node version to 24 (LTS) (mastodon#36539)
de80a54
@ClearlyClaire
Fix value of quote_approval_policy and quoted_status_id in Schedu…
aba30a8 
…ledStatus serializer (mastodon#36549)
@ClearlyClaire
Fix scheduled quote posts being posted as non-quote posts (mastodon#3…
17eb1a7 
…6550)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#36556)
08ae77f 
Co-authored-by: GitHub Actions <[email protected]>
@belatedly
Fix discovery preamble missing word in EN and EN-GB locales (mastodon…
6adbd9c 
…#36560)
@diondiondion
Refresh thread replies periodically & when refocusing window (mastodo…
7ea2af6 
…n#36547)
@diondiondion
Fix text overflow alignment for long author names in News (mastodon#3…
7538bc7 
…6562)
renovate bot and others added 25 commits October 28, 2025 08:32
@renovate
Update dependency @reduxjs/toolkit to v2.9.2 (mastodon#36572)
7ba06a6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency mail to v2.9.0 (mastodon#36575)
4905c19 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@larouxn
[Vite] Remove overridden build.target in favor of legacy plugin def…
f53c4db 
…aults (mastodon#36611)
@renovate
Update dependency webmock to v3.26.0 (mastodon#36605)
e322c17 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency simple_form to v5.4.0 (mastodon#36604)
e4fc18a 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ChaosExAnima
Emoji: Remove final flag (mastodon#36409)
85d0cdb
@renovate
Update dependency annotaterb to v4.20.0 (mastodon#36527)
2b5f683 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@diondiondion
Revert "Fix custom emoji width (mastodon#27969)" (mastodon#36620)
422fa1c
@ClearlyClaire
Add streaming server side filtering for live/topic feed settings (mas…
ccfac27 
…todon#36585)
@renovate
Update dependency devise-two-factor to v6.2.0 (mastodon#36574)
3cace40 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @vitejs/plugin-react to v5.1.0 (mastodon#36600)
1f5cdb3 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency axios to v1.13.0 (mastodon#36612)
3efc747 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ChaosExAnima
Fix props in DisplayName component (mastodon#36622)
9c7d099
@ClearlyClaire
Add support for Update of converted object types (mastodon#36322)
8fb524e
@ClearlyClaire
Fix mention matching ignoring path (mastodon#36626)
3ccb663
@ClearlyClaire
Hashtag fixes (mastodon#36625)
b01d21c
@ClearlyClaire
Change styling of column banners (mastodon#36531)
26ec19a
@diondiondion
chore(deps): update dependency eslint-plugin-jsdoc to v60 (mastodon#3…
e1bd9b9 
…6466)
@renchap
Remove environment variables to config Fetch All Replies behaviour (m…
795aaa1 
…astodon#36627)
@ClearlyClaire
Change firehose labels depending on which feeds are accessible (masto…
4896d2c 
…don#36607)
@ClearlyClaire
Change display of blocked and muted quoted users (mastodon#36619)
e437bb9
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#36632)
7b66eef 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Bump version to v4.5.0-rc.1 (mastodon#36635)
5187708
@mikehikes @claude
Update version to 4.5.0-rc.1-theatlsocial-nightly-20251029
7144a9a 
Merge upstream Mastodon main branch (81 new commits) up to v4.5.0-rc.1:

Key changes:
- Bump version to v4.5.0-rc.1 (mastodon#36635)
- Change display of blocked and muted quoted users (mastodon#36619)
- Change firehose labels depending on which feeds are accessible (mastodon#36607)
- Remove environment variables to config Fetch All Replies behaviour (mastodon#36627)
- Change styling of column banners (mastodon#36531)
- Hashtag fixes (mastodon#36625)
- Fix mention matching ignoring path (mastodon#36626)
- Add support for Update of converted object types (mastodon#36322)
- Add streaming server side filtering for live/topic feed settings (mastodon#36585)
- New Crowdin translations and dependency updates

Full upstream commits: ad9faca..5187708

Resolved conflicts:
- Locale files: kept ours (TheConnector customizations)
- Gemfile.lock: took upstream, added x86_64-linux platform for Docker
- yarn.lock: took upstream
- lib/mastodon/version.rb: updated to nightly-20251029 with rc.1

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>
@mikehikes @claude
Fix yarn.lock for CI builds
a31027e 
Regenerated yarn.lock in linux/x86_64 container to match CI environment.
This fixes the yarn install --immutable check failures.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>
@mikehikes mikehikes merged commit 0e84329 into forked-main Oct 30, 2025
51 of 52 checks passed
mikehikes added a commit that referenced this pull request Nov 12, 2025
@mikehikes @claude
Update version to 4.5.0-theatlsocial-nightly-20251112
24041bb 
Merge upstream Mastodon v4.5.0 tag (31 new commits) from PR #10's last working commit (a31027e):

Key changes:
- v4.5.0 stable release (26c7839)
- CSS Module support (mastodon#36637)
- Quote Posts notifications for DMs and private posts (mastodon#36696)
- Audio upload visualizer (mastodon#36734)
- Announcement dismissal fixes (mastodon#36750)
- New Crowdin translations

Full upstream commits: a31027e..v4.5.0

Resolved conflicts:
- Locale files: kept ours (TheConnector customizations)
- Gemfile.lock: took upstream, added x86_64-linux platform for Docker
- yarn.lock: regenerated in linux/x86_64 container
- lib/mastodon/version.rb: updated to 4.5.0-theatlsocial-nightly-20251112
- .github/workflows/build-releases.yml: took upstream

This merge restores runtime CDN_HOST functionality by avoiding the
import.meta.glob() changes that were introduced in v4.6.0-alpha.1.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>
@mikehikes mikehikes mentioned this pull request Nov 12, 2025
Closed
4 tasks
mikehikes added a commit that referenced this pull request Nov 12, 2025
@mikehikes @claude
Rollback to v4.5.0 by reverting PRs #11 and #12
8395b43 
This commit rolls back TheConnector to Mastodon v4.5.0 by:
1. Reverting PR #12 (CDN_HOST build-time fix)
2. Reverting PR #11 (v4.6.0-alpha.1 merge)
3. Merging v4.5.0 final on top of PR #10's state

This restores runtime CDN_HOST functionality that was broken by
upstream commit ff5d745 (import.meta.glob for emoji loading).

Version: 4.5.0-theatlsocial-20251112

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>
@mikehikes mikehikes mentioned this pull request Nov 12, 2025
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Comments