Repository navigation
chore(sync): integrate Dokploy canary through e0c8d80 - #43
Merged
Merged
Conversation
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
…f-hosted fix(billing): guard loadStripe behind key check for self-hosted instances
…-escape-truncate fix: escape HTML and truncate long messages in Telegram notifications
…e-header-overflow-mobile fix(ui): prevent service header overflow on mobile
* fix: decode Route53 octal escapes in record names * fix: keep escaped dots and backslashes in Route53 record names
Service page headers keep the fork's stacked mobile layout with upstream's overflow fixes; the server badge column is capped at 45% only from sm up. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configuration
You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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 is this PR about?
This PR integrates Dokploy upstream
canarythroughe0c8d80cd(2026-10-17). The fork last synced at53464e909in #42, so the range is53464e909..e0c8d80cd: 12 commits across 4 upstream PRs.Upstream changes:
\052for*in wildcard records) are decoded correctly.<,&or long logs are no longer rejected by the Telegram API.sendTelegramNotificationnow throws when Telegram rejects a message, so a failing test notification shows an error instead of a false success. Deployment and backup senders already wrap each notification in try/catch, so a Telegram failure is logged and does not fail the deployment.loadStripewhenNEXT_PUBLIC_STRIPE_PUBLISHABLE_KEYis set, which avoids a client error on self-hosted installs.Integration review
I resolved 9 conflicts by hand:
flex-col gap-3 sm:flex-row sm:justify-between sm:items-start), and added upstream'smin-w-0/flex-1/truncateoverflow fixes.max-w-[45%], which assumes the single-row layout. The fork stacks the header on mobile, so I apply the cap only fromsmup and leave the column atmax-w-fullbelow that.BREADCRUMB_LABEL_CLASSand added upstream's newtitletooltip on the project label.Fork behavior checked:
hasValidLicense,isEnterpriseCloudorlicenseKeyreferences outside tests. The billing page change is only the Stripe guard.pipeBetweenServersfix from chore(sync): integrate Dokploy canary through 53464e9 #42: still present inremoteStream.ts; this range doesn't touch it.0.44.0.No Product Overview changes are needed in
CLAUDE.md; these are fixes only.Migrations, dependencies, environment
migration:generateruns both reported "No schema changes".pnpm install --frozen-lockfilepasses.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEYis now optional on the client.Verification (local)
pnpm install --frozen-lockfile: passpnpm run format-and-lint: pass (0 errors)pnpm run typecheck --checkers 2) forpackages/server,apps/dokploy,apps/apiandapps/schedules: passapplication.real.test.tsREAL deployment tests. They needdocker build/nixpacks build, and this machine has neither binary. These are infra-only failures, the same as in chore(sync): integrate Dokploy canary through 5df820a #38–chore(sync): integrate Dokploy canary through 53464e9 #42; the hosted test job runs them.BETTER_AUTH_SECRET(never printed or stored): passHosted checks
On
a3addbcea,pr-check (build),pr-check (test)andpr-check (typecheck)all pass on the first run. The hosted test job also runs the real Docker deployment tests that can't run locally.Risk / rollout / rollback
Risk is low: small UI and notification fixes with no schema or dependency changes.
Checklist
canarybranch. (This branch is based on the fork'smainand integrates upstreamcanary.)Issues related (if applicable)
Not applicable for this upstream integration PR.
🤖 Generated with Claude Code