Repository navigation
V0.12.1 develop - #59
Merged
Merged
Conversation
Make open_merge_tool asynchronous to avoid blocking the main thread, fix an argument issue in the CLI handler, and add comprehensive tests for merge tool failures and successful conflict resolution.
Introduce detailed signature statuses for unknown trust, expired signatures, expired keys, and revoked keys. Update the UI to display these as amber warnings with specific explanations and refine the log view's signature verification and revalidation logic.
Replace the generic copyValue function with a dedicated SignatureCopyButton component that provides temporary "Copied" visual feedback. Update tests to verify independent feedback timing and error handling.
…-133368473-kejp [Aikido] Fix security issue in open via minor version upgrade from 5.3.4 to 5.4.0 in src-tauri
…-133372454-7rjt [Aikido] Fix security issue in zerovec-derive via minor version upgrade from 0.11.3 to 0.11.5 in src-tauri
…-133378994-8nr4 [Aikido] Fix 11 security issues in quinn-proto, quick-xml, tauri-plugin-updater and 2 more
Keep Tauri 2.11.6 for the IPC channel security fix and use compatible runtime, macro and build crates. Restrict direct Tauri requirements to their current minor series to avoid pulling incompatible platform APIs into this update.
…-133381026-rn3e [Aikido] Fix security issue in zerovec via minor version upgrade from 0.11.6 to 0.11.8 in src-tauri
Merge the latest target branch and preserve its security dependency updates alongside the compatible Tauri 2.11 graph. Reconcile the lockfile so Cargo accepts the combined dependency requirements with --locked.
Windows accepts connections with the listener non-blocking mode inherited. Explicitly switch the test connection to blocking mode so the existing read timeout waits for request data instead of intermittently failing with WouldBlock.
…-133375656-xagg [Aikido] Fix security issue in tauri via minor version upgrade from 2.11.1 to 2.11.6 in src-tauri
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
1 participant
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.
No description provided.