Repository navigation
Merge #4 and #3 into release/0.5.0 (conflicts resolved) - #14
Merged
Merged
Conversation
Signed-off-by: mrigbozurike <drbillionbook@gmail.com>
Signed-off-by: mrigbozurike <drbillionbook@gmail.com>
Merges #4 (audit: record focused window title and screenshot hash) at 7e07e04. The only conflict is CHANGELOG.md, where #4 and #5 both add an entry under Unreleased; both are kept. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01H6FWzFP6qZXMn5TXipJPRw Signed-off-by: Brian Scott <claudeai@bscott.email>
Merges #3 (systemd: sandbox the user unit) at fc66dbf. Conflicts: CHANGELOG.md (each PR adds an entry under Unreleased; all are kept) and docs/setup-linux.md (#3 and #5 add sections at the same place; both are kept, the unit's sandbox section first under Running, then Persistence is opt-in). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01H6FWzFP6qZXMn5TXipJPRw Signed-off-by: Brian Scott <claudeai@bscott.email>
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.
What
Merges #4 (audit: focused window and screenshot hash) at
7e07e04and #3 (systemd: sandbox the user unit) atfc66dbfintorelease/0.5.0. Each is a plain merge commit of the contributor's unchanged head commit. When this lands, GitHub marks both PRs as merged.Why
After #5 merged, #4 and #3 no longer merged cleanly. The conflicts are text-only:
CHANGELOG.md: each PR adds an entry under Unreleased. All three entries are kept.docs/setup-linux.md: systemd: sandbox the user unit #3 and serve: refuse to run as root #5 add sections at the same place. Both are kept: first "What the unit is allowed to do" (part of Running), then "Persistence is opt-in".No code was changed during the resolution.
Tests
No new tests in this PR. It brings in #4's router tests (the four from the review patch included) and #3's unit-file tests, including two for quoting.
Ran on
Linux (x86_64):
cargo fmt --all -- --checkcargo clippy --all-targets -- -D warningscargo clippy --target x86_64-pc-windows-gnu --all-targets -- -D warningscargo clippy --target aarch64-apple-darwin --all-targets -- -D warningscargo test: 73 passedAll of these pass on this branch. Both PR heads were already green in CI on Linux, macOS and Windows.
Still to do on real machines before 0.5.0 ships:
PrivateTmp.Checklist
cargo testpassescargo fmtandcargo clippy --all-targets -- -D warningspassCHANGELOG.mdentries under Unreleased🤖 Generated with Claude Code
https://claude.ai/code/session_01H6FWzFP6qZXMn5TXipJPRw
Generated by Claude Code