chore: sync 2.4.1 onto master - #695
Merged
Merged
Conversation
Co-authored-by: Cursor <cursoragent@cursor.com>
Greptile SummaryRecords the shipped 2.4.1 hotfix on master so its changelog fragments are not reused by the next release.
Confidence Score: 5/5The PR appears safe to merge because the release metadata is internally consistent and every removed fragment is preserved in the 2.4.1 changelog. All relevant application and extension configurations receive the same version values, and the changelog consolidation retains each consumed security entry without changing executable behavior.
|
| Filename | Overview |
|---|---|
| Bitkit.xcodeproj/project.pbxproj | Consistently updates all application and extension Debug/Release configurations to build 196 and version 2.4.1. |
| CHANGELOG.md | Adds the shipped 2.4.1 security entries and correctly advances release comparison links. |
| changelog.d/next/664.security.md | Removes a consumed fragment whose text is preserved in the 2.4.1 changelog section. |
| changelog.d/next/665.security.md | Removes a consumed fragment whose text is preserved in the 2.4.1 changelog section. |
| changelog.d/next/668.security.md | Removes a consumed fragment whose text is preserved in the 2.4.1 changelog section. |
| changelog.d/next/673.security.md | Removes a consumed fragment whose text is preserved in the 2.4.1 changelog section. |
Reviews (1): Last reviewed commit: "chore: sync 2.4.1 onto master" | Re-trigger Greptile
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
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.
This PR records the shipped 2.4.1 hotfix on master so the next release does not reuse those changelog entries.
Do not merge
release-2.4.1(#678). That branch was cut fromv2.4.0and already contains later 2.5.0 work on master.Description
CURRENT_PROJECT_VERSION195 → 196 andMARKETING_VERSION2.4.0 → 2.4.1## [2.4.1]changelog sectionchangelog.d/next/fragments: fix: stop auto-accepting stale monitors #664, fix: fail closed without vss auth #665, fix: harden shop payment bridge #668, fix: consume vss-client 0.5.23 #673Linked Issues/Tasks
N/A
Screenshot / Video
N/A
QA Notes
Manual Tests
N/A
Automated Checks
N/A
Made with Cursor