Conversation
diondiondion
approved these changes
Nov 10, 2025
mikehikes
added a commit
to theatl-social/theconnector
that referenced
this pull request
Nov 12, 2025
Merge upstream Mastodon main branch (116 new commits) up to b5a2fe7: Key changes: - Version bump to v4.6.0-alpha.1 - Revert "Fix duplicated counters (fix mastodon#32614)" (mastodon#36834) - Update dependencies: aws-sdk-s3, storybook, msw, chromatic, axios, vite - Fix icon buttons animating when they haven't changed (mastodon#36824) - Emoji: Load emoji with hash in URL (mastodon#36808) - Fix scroll shift caused by fetch-all-replies alerts (mastodon#36807) - Ensure the boost button shows a numeric value (mastodon#36805) - Centers GIFs in media modal (mastodon#36806) - Fix dropdown menu not focusing first item when opened via keyboard (mastodon#36804) - Remove webpack hints IDE config (mastodon#36769) - New Crowdin translations (mastodon#36820, mastodon#36786) - Various spec additions and test improvements Full upstream commits: 5187708..b5a2fe7 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 - .github/workflows/build-releases.yml: took upstream - lib/mastodon/version.rb: updated to nightly-20251111 with alpha.1 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #36784, which is a regression from #36673.