Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1517 commits
Select commit Hold shift + click to select a range
42bd30c
Potential fix for pull request finding
tidy-dev Jun 2, 2026
5d8a3b4
Add Copilot model picker UI and tests
sergiou87 Jun 3, 2026
b2f7488
Show billing multiplier in Copilot model labels
sergiou87 Jun 3, 2026
5e11fe3
(WIP) Normalize Copilot model billing and types
sergiou87 Jun 3, 2026
f23bf94
Merge pull request #22244 from desktop/tidy-dev/fix-example-link-cursor
tidy-dev Jun 3, 2026
ca37926
(WIP) Add temporary mock usage billing for Copilot models
sergiou87 Jun 3, 2026
aec59e9
Merge pull request #22180 from eomera19/fix-lfs-tracked-rule-detection
niik Jun 3, 2026
79ed5be
Show model billing in Copilot model picker
sergiou87 Jun 3, 2026
8bb98b2
Merge pull request #22245 from desktop/tidy-dev/conflict-resolution-r…
tidy-dev Jun 3, 2026
1f86c30
Normalize Copilot billing property names
sergiou87 Jun 3, 2026
99bc365
Merge remote-tracking branch 'origin/development' into tidy-dev/copil…
tidy-dev Jun 3, 2026
62c0fdf
Merge pull request #22242 from desktop/tidy-dev/copilot-conflict-sett…
tidy-dev Jun 3, 2026
b4c88fd
Gather rich conflict-resolution context (commits + PRs from both sides)
tidy-dev Jun 3, 2026
97c6459
refactor: use Set<number> instead of dedupeNumbers helper
tidy-dev Jun 3, 2026
8d72391
Merge branch 'development' into model-picker-improvements
sergiou87 Jun 4, 2026
bd625e7
Upgrade copilot-sdk and adapt client/session API
sergiou87 Jun 4, 2026
29d2a48
Remove koffi from copilot bundle
sergiou87 Jun 4, 2026
acf35c7
Rename test fake session destroy -> disconnect
sergiou87 Jun 4, 2026
abe509a
Add nested clipboard package path to copy list
sergiou87 Jun 4, 2026
ddab8b7
Prune mxc binaries per target platform
sergiou87 Jun 4, 2026
de9c05c
Fix getAccessKey to handle escaped ampersands (&&)
niik Jun 4, 2026
9add7f9
refactor: flatten PR list and remove URL plumbing from gathered context
tidy-dev Jun 4, 2026
50e5677
Produce a structured resolution summary from Copilot
tidy-dev Jun 3, 2026
8e1f90f
Remove custom instructions prompt text and backtick restrictions
tidy-dev Jun 4, 2026
050f1d1
Potential fix for pull request finding
sergiou87 Jun 4, 2026
b053775
Adapt to flattened pullRequests and removal of url fields from PR 1
tidy-dev Jun 4, 2026
099cc0b
Add the resolution summary card to the conflicts dialog
tidy-dev Jun 3, 2026
b212693
Add Copilot conflict resolution summary banner
tidy-dev Jun 3, 2026
ecb6847
Remove custom-instructions prompt nudge
tidy-dev Jun 4, 2026
5af8360
Use SandboxedMarkdown for conflict resolution summary
tidy-dev Jun 4, 2026
d685497
Replace section/header with divs to match codebase convention
tidy-dev Jun 4, 2026
63a5135
Route link clicks through dispatcher and simplify reference keys
tidy-dev Jun 4, 2026
6614d22
Trim dead markdown styles and nest SCSS to match DOM hierarchy
tidy-dev Jun 4, 2026
5b22bdc
Add customCSS prop to SandboxedMarkdown for iframe style overrides
tidy-dev Jun 4, 2026
4ab250e
Derive reference URLs from gitHubRepository instead of stored urls
tidy-dev Jun 4, 2026
d73b6fe
Merge pull request #22257 from desktop/bump-copilot-sdk-1.0
sergiou87 Jun 4, 2026
01852f9
Merge branch 'development' into model-picker-improvements
sergiou87 Jun 4, 2026
6506681
Hacks everywhere (until Copilot SDK is fixed)
sergiou87 Jun 4, 2026
79f9323
Merge pull request #22255 from desktop/tidy-dev/conflict-context-gath…
tidy-dev Jun 4, 2026
764c661
Merge pull request #22256 from desktop/tidy-dev/conflict-summary-data
tidy-dev Jun 4, 2026
187d063
Merge pull request #22227 from desktop/copilot/create-test-duplicate-…
niik Jun 5, 2026
3905b4c
Gate worktree support behind beta feature flag
niik Jun 3, 2026
d21eb7a
Fix double separator when worktree menu item is hidden
niik Jun 3, 2026
248b69b
Merge pull request #22248 from desktop/niik/feature-flag-worktree-sup…
niik Jun 5, 2026
121b0a8
Worktree deletion finishing touches
niik Jun 3, 2026
704caaa
Simplify worktree switch-back by passing WorktreeEntry directly
niik Jun 3, 2026
bd5cf56
Address review feedback on delete worktree dialogs
niik Jun 3, 2026
a98d981
Merge pull request #22229 from desktop/releases/3.5.12
niik Jun 5, 2026
b511c9b
Merge pull request #22249 from desktop/niik/worktree-finishing-touches
niik Jun 5, 2026
ae89a1c
Merge pull request #22252 from desktop/tidy-dev/conflict-dialog-summary
tidy-dev Jun 5, 2026
ddb507f
Liiiiint
niik Jun 5, 2026
6f56316
Redesign Copilot conflicts dialog: lightweight file list, stable drop…
tidy-dev Jun 4, 2026
491dde9
Fix accessibility, dismiss guard, and delete-conflict labels
tidy-dev Jun 5, 2026
feb7a0c
Support new Warp registry path with fallback
Cocodrulo Jun 5, 2026
286ca84
Switch Copilot conflict resolution feature flag to beta
tidy-dev Jun 5, 2026
4dd47da
Revert changelog entry
tidy-dev Jun 5, 2026
a37e4e2
Add telemetry counters for Copilot conflict resolution
tidy-dev Jun 5, 2026
9c60256
Support billing-aware Copilot model picker rows
sergiou87 Jun 5, 2026
26345dd
Some style changes
sergiou87 Jun 5, 2026
fabc135
Show billing under selected Copilot model picker
sergiou87 Jun 5, 2026
bf1be0f
Simplify hack
sergiou87 Jun 5, 2026
2c5320d
Refactor Copilot model picker UI and add group header flag
sergiou87 Jun 5, 2026
8564db2
Adjust Copilot model picker spacing and row heights
sergiou87 Jun 8, 2026
5003c4b
Add bordered popover decoration option
sergiou87 Jun 8, 2026
42ce3ac
Add Copilot model cost details popover
sergiou87 Jun 8, 2026
ca127a2
Move CopilotModelSelectionInfo to its own file
sergiou87 Jun 8, 2026
874441d
Move info button prior to text
sergiou87 Jun 8, 2026
14b6dba
Merge pull request #22259 from desktop/tidy-dev/conflicted-files-list…
tidy-dev Jun 8, 2026
74a21a3
Merge pull request #22265 from desktop/tidy-dev/conflicts-resolution-…
tidy-dev Jun 8, 2026
0a0ed3f
Remove obsolete test
sergiou87 Jun 8, 2026
d12a396
Update copilot-model-selection-info.tsx
sergiou87 Jun 8, 2026
5f36989
Prefer cheapest model using billing metadata
sergiou87 Jun 8, 2026
d7a92ee
Refactor Warp registry lookup to accept values
Cocodrulo Jun 8, 2026
09e3183
Merge pull request #22266 from desktop/tidy-dev/copilot-conflict-reso…
tidy-dev Jun 8, 2026
36bf203
Draft release 3.5.13-beta1
github-actions[bot] Jun 8, 2026
61fde94
Apply suggestion from @tidy-dev
tidy-dev Jun 8, 2026
c0c2740
Apply suggestion from @tidy-dev
tidy-dev Jun 8, 2026
80381b3
Apply suggestion from @tidy-dev
tidy-dev Jun 8, 2026
be7c5b4
Apply suggestion from @tidy-dev
tidy-dev Jun 8, 2026
fd306e8
Update changelog.json
niik Jun 9, 2026
c0fb0d9
Fix linting issues
Cocodrulo Jun 9, 2026
e2693f3
Merge pull request #22283 from desktop/releases/3.5.13-beta1
tidy-dev Jun 9, 2026
0164482
Fix variable-height SectionList row offsets
sergiou87 Jun 9, 2026
9485243
Handle incomplete Copilot token pricing
sergiou87 Jun 9, 2026
624a0fe
Add popup ARIA to popover dropdowns
sergiou87 Jun 9, 2026
e631e75
Add aria-describedby to cost details button
sergiou87 Jun 9, 2026
8f9c948
Add aria-label to popover button for model picker
sergiou87 Jun 9, 2026
93c424b
Simplify code
sergiou87 Jun 9, 2026
cd63d7b
Use type-only Copilot RPC imports
sergiou87 Jun 9, 2026
ccd6235
Fix Copilot model comment grammar
sergiou87 Jun 9, 2026
6164432
Scope Copilot preferences ResizeObserver test override
sergiou87 Jun 9, 2026
2731a2f
Use type-only Copilot model imports in tests
sergiou87 Jun 10, 2026
01c5f40
Restore ResizeObserver test globals precisely
sergiou87 Jun 10, 2026
96e1b8e
Potential fix for pull request finding
sergiou87 Jun 10, 2026
7e33412
Honor number preferences for model credit costs
sergiou87 Jun 10, 2026
bb86460
Select cheapest Copilot model without sorting
sergiou87 Jun 11, 2026
d37108b
Use shared formatCompactNumber and update tests
sergiou87 Jun 11, 2026
0086f35
Merge pull request #22282 from desktop/model-picker-improvements
sergiou87 Jun 11, 2026
494ed63
Add copilotLicenseType to user/copy APIs and model
sergiou87 Jun 10, 2026
a4f6b6d
Refactor Copilot preferences access UI
sergiou87 Jun 10, 2026
e61fb48
Support multiple accounts in Copilot prefs
sergiou87 Jun 10, 2026
525b148
Clarify Copilot access messaging
sergiou87 Jun 10, 2026
56eb75e
Rename Copilot sign-in handler and update messaging
sergiou87 Jun 10, 2026
a8daae2
Fix Copilot access state for unloaded metadata
sergiou87 Jun 10, 2026
9805dc6
Update copilot-preferences-test.tsx
sergiou87 Jun 10, 2026
a247bf9
Merge pull request #22290 from desktop/copilot-settings-upsell
sergiou87 Jun 11, 2026
b9663bb
Use account endpoint when creating a client with Copilot SDK
sergiou87 Jun 10, 2026
91be203
(WIP) Use Copilot SDK with GHE accounts
sergiou87 Jun 11, 2026
9df47e5
Use GHE host (strip api.) for Copilot CLI
sergiou87 Jun 11, 2026
69a1e6b
Add GITHUB_COPILOT_INTEGRATION_ID env var
sergiou87 Jun 11, 2026
eb1c9bb
Respect Copilot Desktop enabled flag when selecting account
sergiou87 Jun 11, 2026
88a4311
Remove unnecessary app state field
sergiou87 Jun 11, 2026
8b7cf41
Clear stale Copilot models on account changes
sergiou87 Jun 11, 2026
61c79e4
Warm Copilot models after account updates
sergiou87 Jun 11, 2026
688b0b8
Update app-store.ts
sergiou87 Jun 12, 2026
c61ec77
Add 'Always use Copilot for conflict resolution' setting and nudge
tidy-dev Jun 9, 2026
6069937
Merge pull request #22303 from desktop/copilot-sdk-ghe-compatible
sergiou87 Jun 12, 2026
00cb911
Merge branch 'development' into pr/21982
sergiou87 Jun 15, 2026
7cb7173
Update app/src/lib/shells/win32.ts
tidy-dev Jun 15, 2026
7e3d325
Update octicons and bump @primer/octicons
sergiou87 Jun 15, 2026
f6afd3b
Show spinner icon while generating commit message
sergiou87 Jun 15, 2026
ffae79c
Refactor active session/client names and cancel
sergiou87 Jun 15, 2026
90d31fe
Merge pull request #22285 from desktop/tidy-dev/reimagined-engine
tidy-dev Jun 15, 2026
3340f6d
Add TabBar with Summary/Changes tabs to Copilot conflicts dialog
tidy-dev Jun 5, 2026
cf446bf
Gate Changes tab behind enableCopilotConflictResolutionChangesTab fea…
tidy-dev Jun 15, 2026
c299241
Fix prettier: remove extra blank line in findWarp()
tidy-dev Jun 15, 2026
278f05b
Merge pull request #22264 from Cocodrulo/fix-warp-on-windows
tidy-dev Jun 15, 2026
c45f0a0
Add split-pane layout for Changes tab with FileList and Diff
tidy-dev Jun 15, 2026
b300dfb
Add cancellable Copilot commit generation check
sergiou87 Jun 16, 2026
86a340c
Update Copilot button ariaLabel and disabled logic
sergiou87 Jun 16, 2026
d8fc5f6
Replace mock diff with real resolution diff computation
tidy-dev Jun 16, 2026
2f339d8
Use merge base (stage 1) instead of on-disk conflicted file for diff
tidy-dev Jun 16, 2026
7d632fa
Merge pull request #22271 from desktop/tidy-dev/tidy-dev-copilot-chan…
tidy-dev Jun 16, 2026
e45835f
Use assertNever in renderTabContent for exhaustiveness checking
tidy-dev Jun 16, 2026
d4334d5
Refine commit message generation UI logic
sergiou87 Jun 16, 2026
d9a97cd
Tighten commit-message test runtime checks
sergiou87 Jun 16, 2026
f6b04eb
Merge pull request #22272 from desktop/tidy-dev/tidy-dev-copilot-chan…
tidy-dev Jun 16, 2026
eaf8b5f
Show modified icon instead of conflict warning in changes file list
tidy-dev Jun 16, 2026
63e0a1c
Fix Prettier formatting
tidy-dev Jun 16, 2026
286a409
Address review feedback: race condition, diff type handling, tests, e…
tidy-dev Jun 16, 2026
983a7a7
Add getStageDiff() for computing diffs against merge stages
tidy-dev Jun 16, 2026
6aecccc
Merge pull request #22326 from desktop/tidy-dev/copilot-resolution-di…
tidy-dev Jun 16, 2026
798f87d
Add abortable commit message generation
sergiou87 Jun 16, 2026
6f11e10
Add getStageDiff() for computing diffs against merge stages
tidy-dev Jun 16, 2026
4b274e7
Add getStageDiff() for computing diffs against merge stages
tidy-dev Jun 16, 2026
d04794a
Merge remote-tracking branch 'origin/tidy-dev/resolution-choice-diff-…
tidy-dev Jun 16, 2026
ce3391c
Merge pull request #22324 from desktop/stop-commit-message-generation
sergiou87 Jun 16, 2026
90d2495
Bump form-data from 4.0.4 to 4.0.6
dependabot[bot] Jun 16, 2026
260de21
Add resolution choice dropdown UI to Copilot conflicts Changes tab
tidy-dev Jun 16, 2026
a93cd99
Merge pull request #22331 from desktop/dependabot/npm_and_yarn/form-d…
tidy-dev Jun 16, 2026
c012998
Address review feedback: fix overflow toggle, no-resolution state, docs
tidy-dev Jun 16, 2026
80631e2
Add getStageDiff() for computing diffs against merge stages
tidy-dev Jun 16, 2026
7af4f3a
Merge pull request #22327 from desktop/tidy-dev/resolution-choice-dif…
tidy-dev Jun 17, 2026
a577f48
Merge development into resolution-choice-diff-ui
tidy-dev Jun 17, 2026
4df2c1c
Merge pull request #22333 from desktop/tidy-dev/resolution-choice-dif…
tidy-dev Jun 17, 2026
375c67e
Draft release 3.5.13-beta2
github-actions[bot] Jun 17, 2026
122c345
Make error-reporting endpoints configurable
sergiou87 Jun 17, 2026
c662f74
Update changelog.json
tidy-dev Jun 17, 2026
ff6a2dc
Inline error-reporting endpoint vars
sergiou87 Jun 18, 2026
8fd3087
Extract copilot copy into helper and always run
sergiou87 Jun 18, 2026
ed95e76
Respect feature flag for Copilot SDK commit messages
sergiou87 Jun 18, 2026
3a111da
Remove unused constant
sergiou87 Jun 18, 2026
6976c72
Use removeAndCopy for copilot package copy
sergiou87 Jun 18, 2026
2f5cfab
Merge pull request #22339 from desktop/releases/3.5.13-beta2
tidy-dev Jun 18, 2026
67d3d24
Fix Copilot conflict resolution data loss with per-hunk reassembly
tidy-dev Jun 17, 2026
6224caf
Remove obsolete file-size safety check
tidy-dev Jun 18, 2026
9629bfa
Recover conflict dialog when conflicts are resolved externally
tidy-dev Jun 18, 2026
e286bb9
Diff all resolution options against conflict-marker file
tidy-dev Jun 18, 2026
2e462ec
Merge pull request #22349 from desktop/tidy-dev/fix-conflict-resoluti…
tidy-dev Jun 18, 2026
585d023
Merge pull request #22348 from desktop/tidy-dev/fix-conflict-dialog-e…
tidy-dev Jun 18, 2026
8b53f66
Draft release 3.5.13-beta3
github-actions[bot] Jun 18, 2026
7d19c32
Bump dompurify from 3.4.0 to 3.4.11 in /app
dependabot[bot] Jun 20, 2026
dd55d5a
Render dialog error as a child of dialog
niik Jun 22, 2026
a753047
Keep worktree list in sync when renaming or deleting worktrees
niik Jun 22, 2026
d763ba8
Don't reserve toolbar space for the worktree foldout when hidden
niik Jun 22, 2026
620b1bb
Allocate foldout widths in layout order (worktree, branch, push/pull)
niik Jun 22, 2026
dfc4ed7
Widen the add worktree dialog to 500px
niik Jun 22, 2026
d631052
Keep rename worktree dialog open when the rename fails
niik Jun 22, 2026
1dab232
Reserve toolbar space when the worktree foldout is open with no workt…
niik Jun 22, 2026
1c700a0
Preserve repository state when renaming the selected worktree
niik Jun 22, 2026
0a1a61e
Don't record a worktree deletion when removal fails
niik Jun 22, 2026
97fe1f1
Apply prettier formatting
niik Jun 22, 2026
4ea7d96
Merge pull request #22352 from desktop/releases/3.5.13-beta3
tidy-dev Jun 22, 2026
9959a14
Merge pull request #22363 from desktop/fix-22362
niik Jun 22, 2026
28359fa
Merge pull request #22346 from desktop/prepare-copilot-sdk-for-prod
tidy-dev Jun 22, 2026
871fea6
Merge pull request #22364 from desktop/worktree-ga-fixes
niik Jun 22, 2026
245fbcd
Draft release 3.5.13-beta4
github-actions[bot] Jun 23, 2026
35b85cc
Update changelog with fixes for worktree issues
niik Jun 23, 2026
d997d1e
Ensure GIT_EXEC_PATH is set for hook proxy
niik Jun 23, 2026
824d760
Potential fix for pull request finding
tidy-dev Jun 23, 2026
c27448a
Draft release 3.5.13
github-actions[bot] Jun 23, 2026
55dcab2
Merge pull request #22369 from desktop/releases/3.5.13-beta4
tidy-dev Jun 23, 2026
ed8a603
Update to 3.6.0 and enable Copilot/worktree flags
tidy-dev Jun 23, 2026
e6baebb
Fix copilot preferences tests for always-on conflict resolution
tidy-dev Jun 23, 2026
a0b43a9
Add thank you
niik Jun 24, 2026
dbe43f2
Merge pull request #22355 from desktop/dependabot/npm_and_yarn/app/do…
niik Jun 24, 2026
8c6e031
Bump all the things
niik Jun 24, 2026
2b2320f
Update production electron version
niik Jun 24, 2026
9a4fba9
Merge pull request #22373 from desktop/releases/3.5.13
tidy-dev Jun 24, 2026
fc9aaf8
fix(license-overrides.ts): add missing linuxmusl copilot platform
dtomvan Jun 24, 2026
42f9465
Merge pull request #22089 from desktop/kw/triage-fix-ready-for-review
tidy-dev Jun 24, 2026
60a43d9
Merge pull request #22379 from dtomvan/patch-1
niik Jun 25, 2026
1bd7bdf
Hard code copilot picker popover heights for now
niik Jun 25, 2026
eb8b50a
Remove awaits when stopping Copilot client
sergiou87 Jun 25, 2026
12ae2d2
Make stopClient non-async and handle errors via .catch
sergiou87 Jun 25, 2026
f56ab45
Merge pull request #22391 from desktop/larger-than-life
niik Jun 25, 2026
c777223
Merge pull request #22394 from desktop/dont-wait-stop-client
sergiou87 Jun 25, 2026
6d4fab5
fix: default Copilot model to 'auto' for broader plan compatibility
tidy-dev Jun 24, 2026
78da8d4
Update @github/copilot-sdk to ^1.0.3
tidy-dev Jun 24, 2026
ca6c246
Fix default Copilot model and clean up type annotations
tidy-dev Jun 25, 2026
c508d4e
Draft release 3.6.1-beta1
github-actions[bot] Jun 25, 2026
ff8f8e2
Merge pull request #22396 from desktop/releases/3.6.1-beta1
tidy-dev Jun 25, 2026
a5c5366
Update api.ts
niik Jun 25, 2026
ad90019
Merge pull request #22400 from desktop/copilot-max-sku
niik Jun 25, 2026
5b2ad2d
Draft release 3.6.1-beta2
github-actions[bot] Jun 25, 2026
fac3d88
Merge pull request #22401 from desktop/releases/3.6.1-beta2
tidy-dev Jun 25, 2026
8fa814a
Draft release 3.6.1
github-actions[bot] Jun 25, 2026
45e75a7
Merge pull request #22374 from desktop/bump-actions
niik Jun 25, 2026
1859e22
Merge pull request #22402 from desktop/releases/3.6.1
tidy-dev Jun 25, 2026
e4ea8f5
Fix memoize-one comparator crashing hook proxy
niik Jun 26, 2026
ae67c8f
Disable session store for Copilot requests
sergiou87 Jun 26, 2026
9ad6291
Look up PATH case-insensitively in hook proxy
niik Jun 26, 2026
fc3d191
Remove misleading debug log in hook proxy
niik Jun 26, 2026
52ed9b3
Potential fix for pull request finding
niik Jun 26, 2026
b8c229b
Close watchers on error to avoid leaking
Jun 26, 2026
7c64a5b
Open existing worktree instead of prompting to add it
niik Jun 26, 2026
8ec2c27
Add test dialog to dispatch CLI actions
niik Jun 26, 2026
140d0bc
Merge pull request #22410 from desktop/dont-store-copilot-sessions
sergiou87 Jun 29, 2026
7b156d5
Merge pull request #22232 from aruddick-copia/gh-22231-teardown
niik Jun 29, 2026
900f7e6
Ignore non-left gutter mousedown in diff row
sergiou87 Jun 29, 2026
76016b3
Expand SideBySideDiffRow interaction tests
sergiou87 Jun 29, 2026
6ddcf0b
Update pull_request_template.md
sergiou87 Jun 29, 2026
c73eef3
Merge pull request #22411 from desktop/git-exec-path-in-hooks
niik Jun 29, 2026
de4b367
Merge pull request #22416 from desktop/niik/open-worktree-from-cli
niik Jun 29, 2026
5ac92bb
Merge pull request #22340 from desktop/inject-error-reporting-urls
sergiou87 Jun 29, 2026
cbafa82
Merge pull request #22433 from aruddick-copia/watcher-leak
niik Jun 29, 2026
099a539
Merge pull request #22432 from desktop/middle-click-to-select-hunk-nope
sergiou87 Jun 29, 2026
f62b1c7
Draft release 3.6.2-beta1
github-actions[bot] Jun 29, 2026
c6becef
Add Electron upgrade to v42 to release notes
sergiou87 Jun 29, 2026
1c2dadd
Merge pull request #22437 from desktop/update-3.6-release-notes
sergiou87 Jun 29, 2026
02648b5
Update changelog.json
tidy-dev Jun 29, 2026
e572981
Clarify line endings warning and add link to docs
Whitebrim Jun 30, 2026
fe546c6
Merge pull request #22435 from desktop/releases/3.6.2-beta1
tidy-dev Jun 30, 2026
5706250
Handle Copilot optional license overrides
sergiou87 Jun 30, 2026
7814a05
Merge pull request #22444 from desktop/fix-license-overrides
sergiou87 Jun 30, 2026
6e4372f
[Fixed] Repository list scrolling gets stuck over tall groups
peteski22 Jun 29, 2026
e64598b
Restore ResizeObserver only when it originally existed in test
peteski22 Jun 29, 2026
407100b
Clarify line endings warning and add link to docs
Whitebrim Jun 30, 2026
1ca446e
Merge pull request #21446 from Whitebrim/fix/clarify-line-ending-warning
tidy-dev Jun 30, 2026
82ad6c1
Merge pull request #22438 from peteski22/fix-repository-list-scroll-c…
sergiou87 Jun 30, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ overrides:
- files: 'app/test/**/*'
rules:
'@typescript-eslint/no-non-null-assertion': off
react/jsx-no-bind: off
- files: 'script/**/*'
rules:
'@typescript-eslint/no-non-null-assertion': off
Expand Down
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Automatically request review from desktop/code-reviewers on all PRs
* @desktop/code-reviewers
56 changes: 56 additions & 0 deletions .github/actions/setup-ci-environment/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Setup CI Environment
description: Set up Python, Node.js, optional ffmpeg, and install dependencies.

inputs:
node-version:
description: Node.js version to use.
required: true
arch:
description: Target architecture for dependency installation.
required: true
install-ffmpeg:
description: Whether to install ffmpeg on Windows.
required: false
default: 'false'

runs:
using: composite
steps:
- uses: actions/setup-python@v6
with:
python-version: '3.11'

- name: Use Node.js ${{ inputs.node-version }}
uses: actions/setup-node@v6
with:
node-version: ${{ inputs.node-version }}
cache: yarn

- name: Install ffmpeg
if: ${{ runner.os == 'Windows' && inputs.install-ffmpeg == 'true' }}
shell: bash
run: choco install ffmpeg --yes --no-progress

- name: Install and build dependencies
shell: bash
run: yarn
env:
npm_config_arch: ${{ inputs.arch }}
TARGET_ARCH: ${{ inputs.arch }}

- name: Install cross-compilation copilot package
shell: bash
run: |
# Map runner.os to Node's process.platform naming
case "$RUNNER_OS" in
macOS) PLATFORM=darwin ;;
Windows) PLATFORM=win32 ;;
Linux) PLATFORM=linux ;;
esac

PKG="@github/copilot-${PLATFORM}-${{ inputs.arch }}"

if [ ! -d "app/node_modules/@github/copilot-${PLATFORM}-${{ inputs.arch }}" ]; then
echo "Installing ${PKG} for cross-compilation…"
cd app && yarn add --optional --ignore-platform --ignore-scripts ${PKG}
fi
35 changes: 35 additions & 0 deletions .github/actions/setup-windows-signing/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Setup Windows Signing
description: Install Azure Code Signing prerequisites and authenticate.

inputs:
enabled:
description: Whether Windows signing setup should run.
required: false
default: 'false'
azure-client-id:
description: Azure Code Signing client ID.
required: false
azure-tenant-id:
description: Azure Code Signing tenant ID.
required: false

runs:
using: composite
steps:
- name: Install Azure Code Signing Client
if: ${{ runner.os == 'Windows' && inputs.enabled == 'true' }}
shell: pwsh
run: |
$acsZip = Join-Path $env:RUNNER_TEMP "acs.zip"
$acsDir = Join-Path $env:RUNNER_TEMP "acs"
Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Trusted.Signing.Client/1.0.95 -OutFile $acsZip -Verbose
Expand-Archive $acsZip -Destination $acsDir -Force -Verbose
Copy-Item -Path "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\*" -Include signtool.exe,signtool.exe.manifest,Microsoft.Windows.Build.Signing.mssign32.dll.manifest,mssign32.dll,Microsoft.Windows.Build.Signing.wintrust.dll.manifest,wintrust.dll,Microsoft.Windows.Build.Appx.AppxSip.dll.manifest,AppxSip.dll,Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest,AppxPackaging.dll,Microsoft.Windows.Build.Appx.OpcServices.dll.manifest,OpcServices.dll -Destination "node_modules\electron-winstaller\vendor" -Verbose

- name: Azure Login (OIDC)
if: ${{ runner.os == 'Windows' && inputs.enabled == 'true' }}
uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
with:
client-id: ${{ inputs.azure-client-id }}
tenant-id: ${{ inputs.azure-tenant-id }}
allow-no-subscriptions: true
Loading