Repository navigation
fix(fork): merge upstream 85e009f into patch/desktop-update-capability - #272
Merged
fireboltdude1357 merged 1048 commits intoNov 14, 2026
Conversation
…ngdotgg#24047) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Aatman Jain <lives@MacBook-Pro.local> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#35612) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#24007) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…36588) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…6590) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#25445) Co-authored-by: jason chien <3936511+jason5545@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#24045) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#25472) Co-authored-by: Abid A Gafoor <40262245+sgaabdu4@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…indows (pingdotgg#24006) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#36561) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#25874) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#36602) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nel (pingdotgg#36606) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#36610) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#36604) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#36613) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#25858) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#26069) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#36584) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#36608) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#36626) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…moved (pingdotgg#29155) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…from an earlier hand-off (pingdotgg#35258) Co-authored-by: Mika Hertler <mika@mikahertler.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…renamed or switched (pingdotgg#34984) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#34775) Co-authored-by: kumar-karan <kumar-karan@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…of failing (pingdotgg#34698) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…35304) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ays as strings (pingdotgg#34576) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… starts (pingdotgg#34621) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rives (pingdotgg#35117) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…it status refresh (pingdotgg#32349) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…te completion (pingdotgg#34620) Co-authored-by: Apex-ICP <jesse@apexicp.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… thread (pingdotgg#34990) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ider switch (pingdotgg#34498) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ranch (pingdotgg#34452) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…34308) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…subsequences (pingdotgg#26376) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ngdotgg#35122) Co-authored-by: user <user@qubes-os.org> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#34402) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#36876) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#34670) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ndoned turns (pingdotgg#34639) Co-authored-by: Ali-Al1 <Ali-Al1@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…top-update-capability-upstream-85e009f # Conflicts: # apps/server/src/desktopUpdate/DesktopAppUpdate.test.ts
fireboltdude1357
merged commit Nov 14, 2026
7baac07
into
patch/desktop-update-capability
4 checks passed
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/desktop-update-capabilityconflicts with upstream 85e009f inapps/server/src/desktopUpdate/DesktopAppUpdate.test.ts.Upstream pingdotgg#33605 adds a test for joining a retry to an already downloaded update. The patch adds its "is unavailable when the desktop app reports it cannot update itself" test in the same spot, and git interleaved the two. I rebuilt the file from upstream's version and re-added the patch's three changes whole: the harness's
desktopAppUpdateoption, itstruedefault, and its test. Compared with upstream, the file gains exactly those 9 lines.On a scratch stack of upstream 85e009f 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 (1449 tests) all pass.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code