[pull] development from desktop:development#7
Open
pull[bot] wants to merge 6888 commits intoseanb95531:developmentfrom
Open
[pull] development from desktop:development#7pull[bot] wants to merge 6888 commits intoseanb95531:developmentfrom
pull[bot] wants to merge 6888 commits intoseanb95531:developmentfrom
Conversation
Moved the coerceToBuffer import from './core' to './coerce-to-buffer' for better module separation and clarity.
Added 'GITHEAD_' to the list of safe environment variable prefixes passed to hooks, alongside 'GIT_'. This ensures variables set by git-merge are included unless explicitly excluded.
…dash-4.17.23 Bump lodash from 4.17.21 to 4.17.23 in /app
…-4.17.23 Bump lodash from 4.17.21 to 4.17.23
Return single top level element for React.Component render
Skip mention of --no-verify
Update submodules separately to git checkout
Add an explicit resolve.aliasFields: [] to the renderer webpack configuration to disable using package.json aliasFields during module resolution. This prevents unexpected aliasing from upstream packages and enforces consistent resolution behavior for the renderer build.
Add a comment in app/webpack.common.ts to explain that aliasFields: [] prevents the renderer from resolving browser-specific versions of modules. This is a documentation-only change to clarify intent; no functional behavior was modified.
Support pull hooks
Add AGENTS.md documenting a Copilot agent for upgrading Electron and the corresponding Node.js version in GitHub Desktop. Provides step-by-step guidance on which files to change (separating Electron and Node updates into two commits), verification steps (yarn install, yarn build:dev), PR title/description template, recommended commit messages, and important notes (e.g., do not change production in validate-electron-version.ts, .nvmrc uses a v prefix). Includes references for finding breaking changes and current reference versions.
Prevent the renderer from using browser-specific versions of modules
Update Electron to version 40.1.0
Support merge hooks
…-option Add "Allow empty commit" option to commit options context menu
Release 3.5.7-beta2
Add repo rules validation to the Rename Branch dialog, matching the existing Create Branch dialog behavior. When a user types a new branch name, it is validated against the repository's branch name pattern rulesets via the API. - Added accounts and cachedRepoRulesets props to RenameBranch component - Added debounced checkBranchRules method (500ms) that calls the GitHub API to fetch and validate branch rules - Shows InputError when the user cannot bypass a failing rule (blocks rename) - Shows InputWarning when the user can bypass (allows rename with caution) - Connected aria-describedby for screen reader accessibility - Passed new props from app.tsx popup rendering
Prevents checkBranchRules from firing after the dialog is dismissed, matching the Create Branch dialog's cleanup pattern.
Set a fixed width of 400px on the rename-branch dialog to match the create-branch dialog. Without this, the dialog expands from min-width to accommodate error/warning text when repo rules validation fires. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Call checkBranchRules in componentDidMount so that when the rename branch dialog opens with a pre-filled name that violates repo rules, the error/warning is shown immediately rather than only after typing. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Add support for running Playwright E2E tests against an 'unpackaged' app and make packaged the default in CI. Updates: CI workflow runs packaged E2E step; .gitignore ignores playwright-videos; e2e fixtures gain DESKTOP_E2E_APP_MODE handling and unified launch option logic; package.json adds distinct packaged/unpackaged build/run scripts; build script honors DESKTOP_SKIP_PACKAGE to skip packaging when building unpackaged tests. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Add a CI step to always upload end-to-end test artifacts (playwright videos) after packaged E2E smoke tests. Uses actions/upload-artifact@v4 and names artifacts by matrix friendlyName and arch; warns if no files found.
Add two composite GitHub Actions to centralize repeated CI steps: setup-ci-environment (Python/Node/ffmpeg/install deps) and setup-windows-signing (install Azure Code Signing client + OIDC login). Update .github/workflows/ci.yml to use these reusable actions and pass the appropriate inputs, reducing duplication and making Windows signing and ffmpeg installation configurable.
Add comprehensive documentation for the new Playwright-based E2E smoke test harness at docs/technical/e2e-smoke-tests.md, describing coverage, launch modes, CI integration, updater mocking, artifacts, and usage. Remove the deprecated script/playwright-electron.ts helper which is no longer used by the test harness. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Move checkBranchNameRules() and renderBranchNameRuleError() into a shared utility at ui/lib/branch-name-rule-validation.tsx. Both the create branch and rename branch dialogs now use these shared functions, eliminating ~80 lines of duplicated logic. The shared module also exports IBranchRuleError as a reusable type for the error state shape both dialogs use. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Add a platform check to dismissMoveToApplicationsDialog so it returns immediately when not running on Darwin (macOS). This prevents attempting to locate macOS-specific dialog buttons on other platforms during e2e tests.
Insert a 'Prepare testing environment' step into .github/workflows/ci.yml to run `yarn test:setup` before the Windows signing action. The step passes npm_config_arch from the matrix to ensure the test environment is prepared for the correct architecture.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Add runner.os == 'Windows' condition to the setup-windows-signing action in CI. This change wraps the action in an if check in two job steps so the Windows code-signing setup only runs on Windows runners, preventing it from executing on non-Windows environments.
Add `id-token: write` to the job permissions in .github/workflows/ci.yml so the workflow can request OIDC tokens for cloud provider authentication and secure deployments. This change enables actions that exchange GitHub OIDC tokens (e.g., to assume roles) while keeping the permission scoped to the CI jobs.
Add utilities to determine release channel and centralize 'Check for Updates' clicking in app-launch E2E tests. Tests now skip startup update checks for non-auto-update channels and reuse clickCheckForUpdatesIfAvailable to avoid duplicated locator logic and brittle checks.
Replace a single textContent read and manual wait with Playwright's expect.poll to repeatedly check the About dialog update status. This makes the e2e check more robust by polling up to 15s (1s intervals) for the message "you have the latest version" in app/test/e2e/app-launch.e2e.ts.
Add E2E tests for critical paths
Enforce repository branch name rules in Rename Branch dialog
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )