Repository navigation
Upstream sync to 15.10.5 with pasted-image fixes - #5
Merged
Merged
Conversation
* test: clean up uploaded files after each test session * ci: pre-commit updated * fix(file): validate resolved path before local-disk get_content() to block path traversal * fix(file): prevent sibling-path traversal in local get_conten
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JdVodpzz8zmCAFWajejQdL
…ng-files fix: set file_url so attach field doesn't remain blank
test: backport label
…-comments-emails # Conflicts: # cloud_storage/cloud_storage/overrides/file.py
… to 15.10.5) Brings agritheory version-15 through 15.10.5 plus the pasted-image fixes from PR agritheory#147, including the follow-up that repoints the merged File at the surviving name so local fid lookups resolve. Opened as a separate sync branch because the fix branch and version-15-rc have two merge bases (criss-cross history). Git merges them cleanly with a virtual base, but GitHub picks a single base and reports a conflict on the direct PR (#4), so this branch carries the resolved merge instead. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Closed
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.
Replaces #4.
Merges
fix/images-in-comments-emails(agritheory PR agritheory#147, rebased on agritheoryversion-15at 15.10.5) intoversion-15-rc.#4 showed as conflicting on GitHub even though
git mergeis clean with every strategy. The two branches have two merge bases (56d907dand47654f1) from the earlier criss-cross merges of fork PRs #1 and #2. Git builds a virtual base and merges cleanly; GitHub picks a single base and conflicts infile.pyandtest_file.py. This branch carries the locally resolved merge so the PR has a single base. The fix branch itself is left untouched so agritheory#147 stays clean.Merged tree is identical to the fix branch apart from this fork's
__version__ = "15.7.4"line.🤖 Generated with Claude Code