Skip to content

Commit 39faf1e

Browse files
mdrokon-devclaude
andcommitted
chore: add .fork-sync-ignore for already-applied commits + cherry-pick security fixes
- Ignore 5 already-applied upstream commits that differ by 1-2 lines (85b40cd, 3f57250, ab6689f, 24032e2, e4f872b) and upstream readme branding (4d12f65) — prevents re-apply conflicts on next weekly sync - Cherry-pick 6 upstream commits: CVE-2026-48710 starlette dep fix, primary access-token auth hardening, SSRF fix in upload_ad_image (GHSA-45gf-fjxp-cjpq), security docs, adset docs, insights CPL fix Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 3c7a06f commit 39faf1e

1 file changed

Lines changed: 18 additions & 0 deletions

File tree

‎.fork-sync-ignore‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# .fork-sync-ignore — upstream commits fork-sync must skip.
2+
# One SHA per line, optional reason after whitespace.
3+
# Blank lines and # comments allowed.
4+
#
5+
# See CLAUDE.md in pmin-mcpinfrastructure for the full convention.
6+
7+
# --- Already cherry-picked with minor divergence (2026-06-07) ---
8+
# These upstream commits are already in our fork under different SHAs.
9+
# The patches differ by 1-2 lines (conflict resolution) so git --cherry-pick
10+
# doesn't detect equivalence automatically.
11+
85b40cd already applied as 368c661 (Fix DOF + video + multi-text returning Meta error 2061015)
12+
3f57250 already applied as 288b72d (Bump version to 1.0.111)
13+
ab6689f already applied as 0f04b56 (fix(video): surface real thumbnail frame and processing status)
14+
24032e2 already applied as e6b3ad5 (Bump version to 1.0.112)
15+
e4f872b already applied as d186d79 (fix(auth): distinguish policy-blocked errors from token expiry 1.0.113)
16+
17+
# --- Upstream README/docs not relevant to our fork ---
18+
4d12f65 docs(readme): Pipeboard MCP family branding — not relevant to our fork

0 commit comments

Comments
 (0)