Repository navigation
fix(fork): merge upstream 3808e2d into patch/bots - #274
Merged
Merged
Conversation
…pingdotgg#29785) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…6793) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s load or after a network blip (pingdotgg#28708) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#28945) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…h the server rejects (pingdotgg#29845) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… the message (pingdotgg#29834) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#29850) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…elled queued messages (pingdotgg#29874) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#33294) Co-authored-by: Geezy <igor.licko@gloryck.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ry (pingdotgg#29809) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…eview (pingdotgg#29822) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rst (pingdotgg#29871) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… run in 60 minutes" (pingdotgg#29756) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ose (pingdotgg#36818) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…el (pingdotgg#29996) Co-authored-by: Nathan Wong <20381195+thelogicmatrix@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…own merge request (pingdotgg#29791) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#33461) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… to 3x later (pingdotgg#33550) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…composer (pingdotgg#33341) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#33475) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…anded (pingdotgg#33513) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#29801) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ve description-only matches (pingdotgg#33692) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… not a same-named one on PATH (pingdotgg#33836) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#33586) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#36824) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ses for them (pingdotgg#36950) Co-authored-by: 0xpolarzero <0xpolarzero@gmail.com>
…ingdotgg#23166) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#22614) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#30066) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…9466) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#23134) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…t switches back (pingdotgg#30107) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#24140) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#34636) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#30209) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… (6.3 s → 0.21 s median) (pingdotgg#30059) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ent (pingdotgg#22629) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…21838) Co-authored-by: Ved Pandey <vedprakash2302@gmail.com>
…parent was delegated from (pingdotgg#30334) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#30226) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…→ 20 ms median) (pingdotgg#30305) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ce (pingdotgg#30394) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ion (pingdotgg#30565) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ed tasks (pingdotgg#30428) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#30311) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…breaks media in PR descriptions (pingdotgg#30571) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…-upstream-3808e2d # Conflicts: # apps/web/src/components/CommandPalette.tsx
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.
The fork's nightly build fails because
patch/botsconflicts with upstream 3808e2d in the../state/entitiesimport ofapps/web/src/components/CommandPalette.tsx.Upstream pingdotgg#30428 imports
useDelegatedUnderParenton the same line where the patch importsuseBotProjectKeys. The import now includes both.On a scratch stack of upstream 3808e2d with all 26 patches and this branch,
pnpm install --no-frozen-lockfile,vp run typecheck(41 of 41) andvp test runon the 49 test files the patches touch (1457 tests) all pass.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code