[Promote][csp #1] fix(csp): allow the private S3 bucket origin in connect-src (uploads died on CSP-serving domains) (#322) - #324
Merged
Conversation
Thingtime-Promotion-Reservation: v1 Thingtime-Promotion-Source-PR: 322 Thingtime-Promotion-Base-Ref: main Thingtime-Promotion-Base-SHA: 440c30d Thingtime-Promotion-Branch: promote/pr-322-csp-allow-s3-uploads--to-main Thingtime-Promotion-Source-Start-SHA: dfca890 Thingtime-Promotion-Source-End-SHA: c73565d Thingtime-Promotion-Source-Lineage: verified Thingtime-Promotion-Plan-Hash: 8cc9adfd69e3162cf56abae635a546219281ef65db7fcd93f8caa0d340682f64
Thingtime-Promotion-Source-PR: 322 Thingtime-Promotion-Base-Ref: main Thingtime-Promotion-Base-SHA: 440c30d Thingtime-Promotion-Branch: promote/pr-322-csp-allow-s3-uploads--to-main Thingtime-Promotion-Source-Tip-SHA: c73565d Thingtime-Promotion-Source-Start-SHA: dfca890 Thingtime-Promotion-Source-End-SHA: c73565d Thingtime-Promotion-Source-Lineage: verified Thingtime-Promotion-Plan-Hash: 8cc9adfd69e3162cf56abae635a546219281ef65db7fcd93f8caa0d340682f64 Thingtime-Promotion-Patch-ID: 6794355390a1e7988f5dbd1024e5104817f044ac Resolved by the promotion worker: https://github.com/lopugit/thingtime/actions/runs/32222553788
graphify extract with semantic claude-cli backend; unchanged content reused the tracked cache Thingtime-Promotion-Plan-Hash: 8cc9adfd69e3162cf56abae635a546219281ef65db7fcd93f8caa0d340682f64 Refreshed by the promotion conflict worker: https://github.com/lopugit/thingtime/actions/runs/32222553788
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Contributor
|
🤖 Automatic promotion conflict resolution completed. Source PR: #322 · plan: Base: Reservation: Please manually review the paths the isolated AI resolved:
Delete-shaped conflicts were resolved deterministically toward the source patch (no model involved — a deletion has no merged text to arbitrate):
Model waterfall: |
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.
Automated promotion of #322 from
developtomain, opened by the Promote features to main workflow for release review.Source
developc73565d43be071df457899dff4dd87581c81a329claude/csp-allow-s3-uploadsHow to review
main(
git cherry-pick -x; each commit message references the original SHA).main—the Sync main into develop workflow keeps
developaligned afterwards.main;the workflow never recreates a closed promotion (reopen it to change your mind).
Promote develop to main PR instead — this PR's diff then becomes
empty and the workflow closes it automatically.
Automatic conflict-resolution review
main, so the trusted AIpromotion resolver produced this branch automatically instead of leaving manual commands.
Graphify output was handled as derived data, and unresolved conflict markers were rejected.
github-actions[bot]comment on source PR fix(csp): allow the private S3 bucket origin in connect-src (uploads died on CSP-serving domains) #322 attests the exactbase, source endpoints, reservation commit, final head, plan hash, and resolver run.
🤖 Generated by the
promote-features-to-mainworkflow.