Skip to content

chore: sync upstream dubinc/dub main into main-staging - #87

Merged
VinneyJ merged 2295 commits into
main-stagingfrom
automation/sync-upstream-main-staging
Oct 19, 2026
Merged

VinneyJ merged 2295 commits into
main-stagingfrom
automation/sync-upstream-main-staging

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 7, 2026 •

Copy link
Copy Markdown

This PR was created by the weekly upstream sync workflow.

It syncs dubinc/dub/main into main-staging using a real merge so upstream commit history is preserved.
Upstream workflow changes are excluded: .github/workflows/ is kept exactly as it is on the staging base. Upstream commits remain in the merge history.
Behind/ahead counts are measured against main, because that is the production/default branch.
It does not auto-merge.

Sync status

  • Fork commits ahead of upstream: 38
  • Upstream commits missing from the fork: 2294
  • Compare branch: main at 1881211f943607586882953c7579f7cb4956853d
  • Base branch: main-staging at 4409193c17c9093b38e5b4e02326513e5b1dc92b
  • Upstream branch: dubinc/dub/main at dff810b69dad25c3ad21429b4a011f6c0b2cf4d3
  • Workflow result: created_with_conflicts_resolved_to_upstream_tree

Merge conflicts

Merge conflicts were detected. The workflow preserved merge ancestry and resolved the sync branch to the upstream tree, while keeping the fork's entire workflow directory and sync helper script.

Conflicted files:

packages/utils/src/constants/main.ts

Review and merge process

  1. Confirm this PR contains upstream commits only; CFA-specific changes should go in a separate PR.
  2. Merge this PR into main-staging with a merge commit. Do not squash or rebase it, otherwise the upstream history will not be preserved.
  3. Test the staging branch after merge.
  4. Promote main-staging to main only after staging looks good.

@vercel

vercel Bot commented Sep 7, 2026 •

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated
dub Error Error Oct 19, 2026 6:35am UTC

Request Review

Joker666 and others added 16 commits October 14, 2026 13:28
getAnalytics and getEvents now turn the Tinybird 30s timeout into a
bad_request error. Before, workspace routes such as /api/analytics
returned a 500 for it.
getAnalytics and getEvents now handle the Tinybird timeout, so the
partner-profile analytics and events routes do not need their own check.
Makes the buttons flex-1 to fill the space
ProgramSchema now requires environment, so the fixture without it failed to parse.
- Disable claiming .link domain
- Show invoices but with environment banner
Add application screening and spam-hold
marcusljf and others added 27 commits October 16, 2026 11:04
Keep partner link titles out of embed earnings
…zone

Fall back to UTC when billing usage receives an invalid timezone.
Skip the settings and onboarding invite UI when the workspace is not
production, and reject slack-invite API requests with assertProductionWorkspace.

Co-authored-by: Steven Tey <steven@dub.co>
…tream-main-staging

# Conflicts:
#	packages/utils/src/constants/main.ts
@github-actions
github-actions Bot force-pushed the automation/sync-upstream-main-staging branch from 20a651f to 4301b6a Compare October 19, 2026 06:30
@VinneyJ
VinneyJ merged commit 063f5d8 into main-staging Oct 19, 2026
2 of 3 checks passed

This branch had an error being deployed

1 failed deployment
Preview — 4301b6a8 Deployed Oct 19, 2026 by vercel[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants