mirror of
https://github.com/desktop/desktop
synced 2024-08-24 18:57:33 +00:00
Merge branch 'development' into windows-notifications-fixes
This commit is contained in:
commit
ca4209f01d
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -15,7 +15,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
node: [14.15.4]
|
||||
node: [14.17.0]
|
||||
os: [macos-10.15, windows-2019]
|
||||
arch: [x64, arm64]
|
||||
include:
|
||||
|
|
|
@ -1 +1 @@
|
|||
14.15.1
|
||||
14.17.0
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
python 3.9.5
|
||||
nodejs 14.15.1
|
||||
nodejs 14.17.0
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
"productName": "GitHub Desktop",
|
||||
"bundleID": "com.github.GitHubClient",
|
||||
"companyName": "GitHub, Inc.",
|
||||
"version": "2.9.6",
|
||||
"version": "2.9.7-beta1",
|
||||
"main": "./main.js",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
@ -42,7 +42,7 @@
|
|||
"fs-admin": "^0.19.0",
|
||||
"fs-extra": "^9.0.1",
|
||||
"fuzzaldrin-plus": "^0.6.0",
|
||||
"keytar": "^7.7.0",
|
||||
"keytar": "^7.8.0",
|
||||
"marked": "^4.0.10",
|
||||
"mem": "^4.3.0",
|
||||
"memoize-one": "^4.0.3",
|
||||
|
|
|
@ -165,5 +165,5 @@ export function enablePullRequestQuickView(): boolean {
|
|||
|
||||
/** Should we enable high-signal notifications? */
|
||||
export function enableHighSignalNotifications(): boolean {
|
||||
return enableDevelopmentFeatures()
|
||||
return __DARWIN__ ? enableBetaFeatures() : enableDevelopmentFeatures()
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# The least terrible way to resolve a symlink to its real path.
|
||||
function realpath() {
|
||||
/usr/bin/python -c "import os,sys; print(os.path.realpath(sys.argv[1]))" "$0";
|
||||
/usr/bin/perl -e "use Cwd;print Cwd::abs_path(@ARGV[0])" "$0";
|
||||
}
|
||||
|
||||
CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")"
|
||||
|
|
|
@ -853,13 +853,13 @@ keyboardevents-areequal@^0.2.1:
|
|||
resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
|
||||
integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==
|
||||
|
||||
keytar@^7.7.0:
|
||||
version "7.7.0"
|
||||
resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz#3002b106c01631aa79b1aa9ee0493b94179bbbd2"
|
||||
integrity sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==
|
||||
keytar@^7.8.0:
|
||||
version "7.8.0"
|
||||
resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.8.0.tgz#28cf5ceeb1275350888870022869b8b4fe6a87f9"
|
||||
integrity sha512-mR+BqtAOIW8j+T5FtLVyckCbvROWQD+4FzPeFMuk5njEZkXLpVPCGF26Y3mTyxMAAL1XCfswR7S6kIf+THSRFA==
|
||||
dependencies:
|
||||
node-addon-api "^3.0.0"
|
||||
prebuild-install "^6.0.0"
|
||||
node-addon-api "^4.3.0"
|
||||
prebuild-install "^7.0.1"
|
||||
|
||||
keyv@^3.0.0:
|
||||
version "3.1.0"
|
||||
|
@ -1067,11 +1067,6 @@ node-abi@^3.3.0:
|
|||
dependencies:
|
||||
semver "^7.3.5"
|
||||
|
||||
node-addon-api@^3.0.0:
|
||||
version "3.0.2"
|
||||
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.2.tgz#04bc7b83fd845ba785bb6eae25bc857e1ef75681"
|
||||
integrity sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==
|
||||
|
||||
node-addon-api@^3.1.0:
|
||||
version "3.1.0"
|
||||
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239"
|
||||
|
|
|
@ -1,5 +1,21 @@
|
|||
{
|
||||
"releases": {
|
||||
"2.9.7-beta1": [
|
||||
"[New] Initial support for system notifications when checks fail in macOS - #13655",
|
||||
"[Added] Support pushing workflow files for GitHub Actions to GitHub Enterprise Server - #13640",
|
||||
"[Added] Support CLion as an external editor - #13739. Thanks @Pinzauti!",
|
||||
"[Fixed] Fix close button in full screen mode on macOS - #12838",
|
||||
"[Fixed] Commit message dialog background styles match dialog - #13606",
|
||||
"[Fixed] Ensure job steps on pull request check run list are always present - #13531",
|
||||
"[Improved] Take alias into account when sorting repositories - #13429",
|
||||
"[Improved] Upgrade to Electron v14.2.3 - #13689",
|
||||
"[Improved] Support avatars on GitHub Enterprise Server - #13719",
|
||||
"[Improved] Fetch before trying to follow a URL link to a specific branch - #13641. Thanks @Bestra!",
|
||||
"[Improved] Add \"View on GitHub\" context menu option to repository list items - #13227. Thanks @lhvy!",
|
||||
"[Improved] Signal when a commit summary is getting long - #2055. Thanks @Twixes!",
|
||||
"[Improved] Check run group headers and checks stay in view while scrolling the sub checks or job steps. - #13532",
|
||||
"[Improved] Remove unnecessary punctuation in appearance settings- #13715. Thanks @Pinzauti!"
|
||||
],
|
||||
"2.9.6": [
|
||||
"[Added] View and re-run the check runs for the checked out pull request.",
|
||||
"[Fixed] Tooltip improvements and polish - #13452 #13449",
|
||||
|
|
Loading…
Reference in a new issue