Repository navigation
chore: sync fork with upstream c9e9e7d36a - #31
Merged
Merged
Conversation
…-foreground-muted (pingdotgg#40676) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#40701) Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…not generate text (pingdotgg#40699) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#40682) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s the draft (pingdotgg#40708) Co-authored-by: Julius Marminge <julius0216@outlook.com>
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.
Fork main was 7 commits behind
pingdotgg/t3codemain: the 6 that landed while #30 was being checked, plus pingdotgg#40708.Merged upstream main
c9e9e7d36ainto this branch with a real merge. Fork main (5a349ab4ae) is the first parent and was the branch head, so the PR needs no force-push. There were no conflicts: the only file both sides changed isProviderRegistry.test.ts, where the fork's Auto-slug filter and upstream's login-shell PATH cases are in different hunks. The fork's diff against upstream is 119 files before and after the merge, with identical added and removed lines in every file. Upstream's text-generation fallback (pingdotgg#40699) and login-shell PATH refresh on provider refresh (pingdotgg#40693) were checked against the fork's Auto models and instances; neither needed a change.Checks:
vp run check:changed upstream/mainpasses every step (43 packages, 1605 tests in 57 files).vp run check:changed origin/mainpasses every step (284 tests in 11 files).vp run i18n:checkpasses. A scratch data dir, seeded withmigrate-dev-dbfrom a read-only copy of the live database, booted the server, completed V2 orchestration recovery and answered HTTP 302. No deploy or service restart was done.These 7 commits change no migrations, lockfile or package manifests. Upstream moved 3 more commits during the checks (
11224f63d2: pingdotgg#39822, pingdotgg#40154, pingdotgg#40703); they touch no fork file, merge without conflicts, and go in the next sync.