is not interactive, but its children are, so we need to
- disable the jsx-a11y/no-static-element-interactions rule.
- */}
- {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
-
- {itemTypes.map(this.renderDropdownItem)}
-
- >
+
)
}
}
- private onDropdownKeyDown = (event: React.KeyboardEvent
) => {
- // Allow using Up and Down arrow keys to navigate the dropdown items
- // (equivalent to Tab and Shift+Tab)
- if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') {
- return
- }
-
- event.preventDefault()
- const dropdown = event.currentTarget
- const items = dropdown.querySelectorAll(
- `.${DropdownItemClassName}`
- )
- const focusedItem = dropdown.querySelector(':focus')
- if (!focusedItem) {
- return
- }
-
- const focusedIndex = Array.from(items).indexOf(focusedItem)
- const nextIndex =
- event.key === 'ArrowDown' ? focusedIndex + 1 : focusedIndex - 1
- // http://javascript.about.com/od/problemsolving/a/modulobug.htm
- const nextItem = items[(nextIndex + items.length) % items.length]
- nextItem?.focus()
- }
-
public render() {
return this.renderButton()
}
- private getDropdownItemWithType(type: DropdownItemType): DropdownItem {
- const { remoteName } = this.props
-
- switch (type) {
- case DropdownItemType.Fetch:
- return {
- title: `Fetch ${remoteName}`,
- description: `Fetch the latest changes from ${remoteName}`,
- action: this.fetch,
- icon: syncClockwise,
- }
- case DropdownItemType.ForcePush:
- return {
- title: `Force push ${remoteName}`,
- description: (
- <>
- Overwrite any changes on {remoteName} with your local changes
-
-
-
- Warning: A force push
- will rewrite history on the remote. Any collaborators working on
- this branch will need to reset their own local branch to match
- the history of the remote.
-
- >
- ),
- action: this.forcePushWithLease,
- icon: forcePushIcon,
- }
- }
- }
-
- public renderDropdownItem = (type: DropdownItemType) => {
- const item = this.getDropdownItemWithType(type)
- return (
-
- )
- }
-
private renderButton() {
const {
progress,
From 1d9cbd3baaa9b4fa4ce2facf370f00156530c851 Mon Sep 17 00:00:00 2001
From: Shivareddy-Aluri
Date: Thu, 19 Jan 2023 22:14:22 +0530
Subject: [PATCH 45/65] review changes
---
app/src/ui/repository-settings/repository-settings.tsx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/src/ui/repository-settings/repository-settings.tsx b/app/src/ui/repository-settings/repository-settings.tsx
index 468e9a871b..9c1bcf9f2b 100644
--- a/app/src/ui/repository-settings/repository-settings.tsx
+++ b/app/src/ui/repository-settings/repository-settings.tsx
@@ -286,14 +286,15 @@ export class RepositorySettings extends React.Component<
private onSubmit = async () => {
this.setState({ disabled: true, errors: undefined })
const errors = new Array()
+ const modifiedUrl = this.state.remote?.url.trim()
if (this.state.remote && this.props.remote) {
- if (this.state.remote.url !== this.props.remote.url) {
+ if (modifiedUrl !== this.props.remote.url) {
try {
await this.props.dispatcher.setRemoteURL(
this.props.repository,
this.props.remote.name,
- this.state.remote.url.trim()
+ this.state.remote.url
)
} catch (e) {
log.error(
From 18c155346252412b1b3fd9a1ce0be92039ce6d24 Mon Sep 17 00:00:00 2001
From: Sergio Padrino
Date: Fri, 20 Jan 2023 13:10:05 +0100
Subject: [PATCH 46/65] Feature-flag push-pull-fetch dropdown for beta builds
---
app/src/lib/feature-flag.ts | 5 ++
app/src/ui/toolbar/push-pull-button.tsx | 64 +++++++++++++++++++++++++
2 files changed, 69 insertions(+)
diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts
index 67c445ba3e..ee5716f0d6 100644
--- a/app/src/lib/feature-flag.ts
+++ b/app/src/lib/feature-flag.ts
@@ -122,3 +122,8 @@ export function enableStackedPopups(): boolean {
export function enablePreventClosingWhileUpdating(): boolean {
return enableBetaFeatures()
}
+
+/** Should we enable the new push-pull-fetch dropdown? */
+export function enablePushPullFetchDropdown(): boolean {
+ return enableBetaFeatures()
+}
diff --git a/app/src/ui/toolbar/push-pull-button.tsx b/app/src/ui/toolbar/push-pull-button.tsx
index 43bfdf2c09..7080307e8c 100644
--- a/app/src/ui/toolbar/push-pull-button.tsx
+++ b/app/src/ui/toolbar/push-pull-button.tsx
@@ -22,6 +22,7 @@ import {
import { FoldoutType } from '../../lib/app-state'
import { ForcePushBranchState } from '../../lib/rebase'
import { PushPullButtonDropDown } from './push-pull-button-dropdown'
+import { enablePushPullFetchDropdown } from '../../lib/feature-flag'
export const DropdownItemClassName = 'push-pull-dropdown-item'
@@ -375,6 +376,27 @@ export class PushPullButton extends React.Component {
? 'Publish this branch to GitHub'
: 'Publish this branch to the remote'
+ if (!enablePushPullFetchDropdown()) {
+ const className = classNames(
+ this.defaultButtonProps().className,
+ 'nudge-arrow',
+ {
+ 'nudge-arrow-up': shouldNudge,
+ }
+ )
+
+ return (
+
+ )
+ }
+
const className = classNames(
this.defaultDropdownProps().className,
'nudge-arrow',
@@ -436,6 +458,20 @@ export class PushPullButton extends React.Component {
dropdownItemTypes.push(DropdownItemType.ForcePush)
}
+ if (!enablePushPullFetchDropdown()) {
+ return (
+
+ {renderAheadBehind(aheadBehind, numTagsToPush)}
+
+ )
+ }
+
return (
{
lastFetched: Date | null,
onClick: () => void
) {
+ if (!enablePushPullFetchDropdown()) {
+ return (
+
+ {renderAheadBehind(aheadBehind, numTagsToPush)}
+
+ )
+ }
+
return (
{
lastFetched: Date | null,
onClick: () => void
) {
+ if (!enablePushPullFetchDropdown()) {
+ return (
+
+ {renderAheadBehind(aheadBehind, numTagsToPush)}
+
+ )
+ }
+
return (
Date: Fri, 20 Jan 2023 13:25:48 +0100
Subject: [PATCH 47/65] Remove unnecessary parameters
---
app/src/ui/toolbar/push-pull-button.tsx | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/app/src/ui/toolbar/push-pull-button.tsx b/app/src/ui/toolbar/push-pull-button.tsx
index 7080307e8c..101d852093 100644
--- a/app/src/ui/toolbar/push-pull-button.tsx
+++ b/app/src/ui/toolbar/push-pull-button.tsx
@@ -270,13 +270,7 @@ export class PushPullButton extends React.Component {
const { ahead, behind } = aheadBehind
if (ahead === 0 && behind === 0 && numTagsToPush === 0) {
- return this.fetchButton(
- remoteName,
- aheadBehind,
- numTagsToPush,
- lastFetched,
- this.fetch
- )
+ return this.fetchButton(remoteName, lastFetched, this.fetch)
}
if (forcePushBranchState === ForcePushBranchState.Recommended) {
@@ -422,8 +416,6 @@ export class PushPullButton extends React.Component {
private fetchButton(
remoteName: string,
- aheadBehind: IAheadBehind,
- numTagsToPush: number,
lastFetched: Date | null,
onClick: () => void
) {
From 9bf66270b7d187f32c9410f53f0310128b80a3fc Mon Sep 17 00:00:00 2001
From: Shivareddy-Aluri
Date: Sun, 22 Jan 2023 23:25:39 +0530
Subject: [PATCH 48/65] Update repository-settings.tsx
---
.../repository-settings.tsx | 27 +++++++++----------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/app/src/ui/repository-settings/repository-settings.tsx b/app/src/ui/repository-settings/repository-settings.tsx
index 9c1bcf9f2b..286058cac3 100644
--- a/app/src/ui/repository-settings/repository-settings.tsx
+++ b/app/src/ui/repository-settings/repository-settings.tsx
@@ -289,20 +289,19 @@ export class RepositorySettings extends React.Component<
const modifiedUrl = this.state.remote?.url.trim()
if (this.state.remote && this.props.remote) {
- if (modifiedUrl !== this.props.remote.url) {
- try {
- await this.props.dispatcher.setRemoteURL(
- this.props.repository,
- this.props.remote.name,
- this.state.remote.url
- )
- } catch (e) {
- log.error(
- `RepositorySettings: unable to set remote URL at ${this.props.repository.path}`,
- e
- )
- errors.push(`Failed setting the remote URL: ${e}`)
- }
+ const trimmedUrl = this.state.remote.url.trim()
+ try {
+ await this.props.dispatcher.setRemoteURL(
+ this.props.repository,
+ this.props.remote.name,
+ trimmedUrl
+ )
+ } catch (e) {
+ log.error(
+ `RepositorySettings: unable to set remote URL at ${this.props.repository.path}`,
+ e
+ )
+ errors.push(`Failed setting the remote URL: ${e}`)
}
}
From 144f30d8f8631f7f1a0f36f5912503abc381cbe1 Mon Sep 17 00:00:00 2001
From: Shivareddy-Aluri
Date: Sun, 22 Jan 2023 23:34:19 +0530
Subject: [PATCH 49/65] Update repository-settings.tsx
---
app/src/ui/repository-settings/repository-settings.tsx | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/src/ui/repository-settings/repository-settings.tsx b/app/src/ui/repository-settings/repository-settings.tsx
index 286058cac3..ffe3fe5b89 100644
--- a/app/src/ui/repository-settings/repository-settings.tsx
+++ b/app/src/ui/repository-settings/repository-settings.tsx
@@ -286,7 +286,6 @@ export class RepositorySettings extends React.Component<
private onSubmit = async () => {
this.setState({ disabled: true, errors: undefined })
const errors = new Array()
- const modifiedUrl = this.state.remote?.url.trim()
if (this.state.remote && this.props.remote) {
const trimmedUrl = this.state.remote.url.trim()
From e6bfcc9bd9e1dd9a0a6d547032bcb62a1a638961 Mon Sep 17 00:00:00 2001
From: Sergio Padrino
Date: Mon, 23 Jan 2023 13:12:16 +0100
Subject: [PATCH 50/65] Only show force-push warning when confirmation dialog
is disabled
---
app/src/ui/app.tsx | 1 +
.../ui/toolbar/push-pull-button-dropdown.tsx | 28 +++++++++++++------
app/src/ui/toolbar/push-pull-button.tsx | 6 ++++
3 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx
index bac06f05fa..bbe2be7374 100644
--- a/app/src/ui/app.tsx
+++ b/app/src/ui/app.tsx
@@ -2825,6 +2825,7 @@ export class App extends React.Component {
this.state.currentOnboardingTutorialStep === TutorialStep.PushBranch
}
isDropdownOpen={isDropdownOpen}
+ askForConfirmationOnForcePush={this.state.askForConfirmationOnForcePush}
onDropdownStateChanged={this.onPushPullDropdownStateChanged}
/>
)
diff --git a/app/src/ui/toolbar/push-pull-button-dropdown.tsx b/app/src/ui/toolbar/push-pull-button-dropdown.tsx
index 603735bc84..49ca29ca40 100644
--- a/app/src/ui/toolbar/push-pull-button-dropdown.tsx
+++ b/app/src/ui/toolbar/push-pull-button-dropdown.tsx
@@ -13,6 +13,9 @@ interface IPushPullButtonDropDownProps {
/** The name of the remote. */
readonly remoteName: string | null
+ /** Will the app prompt the user to confirm a force push? */
+ readonly askForConfirmationOnForcePush: boolean
+
readonly fetch: () => void
readonly forcePushWithLease: () => void
}
@@ -73,25 +76,32 @@ export class PushPullButtonDropDown extends React.Component
+
+
+
+ Warning: A force push will
+ rewrite history on the remote. Any collaborators working on this
+ branch will need to reset their own local branch to match the
+ history of the remote.
+
+ >
+ )
return {
title: `Force push ${remoteName}`,
description: (
<>
Overwrite any changes on {remoteName} with your local changes
-
-
-
- Warning: A force push
- will rewrite history on the remote. Any collaborators working on
- this branch will need to reset their own local branch to match
- the history of the remote.
-
+ {forcePushWarning}
>
),
action: this.props.forcePushWithLease,
icon: forcePushIcon,
}
+ }
}
}
diff --git a/app/src/ui/toolbar/push-pull-button.tsx b/app/src/ui/toolbar/push-pull-button.tsx
index 101d852093..29bdc93394 100644
--- a/app/src/ui/toolbar/push-pull-button.tsx
+++ b/app/src/ui/toolbar/push-pull-button.tsx
@@ -78,6 +78,9 @@ interface IPushPullButtonProps {
/** Whether or not the push-pull dropdown is currently open */
readonly isDropdownOpen: boolean
+ /** Will the app prompt the user to confirm a force push? */
+ readonly askForConfirmationOnForcePush: boolean
+
/**
* An event handler for when the drop down is opened, or closed, by a pointer
* event or by pressing the space or enter key while focused.
@@ -218,6 +221,9 @@ export class PushPullButton extends React.Component {
remoteName={this.props.remoteName}
fetch={this.fetch}
forcePushWithLease={this.forcePushWithLease}
+ askForConfirmationOnForcePush={
+ this.props.askForConfirmationOnForcePush
+ }
/>
)
}
From 2cec02cb6f4f901c185f987faa25c770430a07a3 Mon Sep 17 00:00:00 2001
From: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
Date: Mon, 23 Jan 2023 11:41:40 -0500
Subject: [PATCH 51/65] Actually.. bump to 22
---
package.json | 2 +-
yarn.lock | 181 +++++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 161 insertions(+), 22 deletions(-)
diff --git a/package.json b/package.json
index 4175987b9a..7294c1aec1 100644
--- a/package.json
+++ b/package.json
@@ -155,7 +155,7 @@
"@types/webpack-hot-middleware": "^2.25.6",
"@types/webpack-merge": "^5.0.0",
"@types/xml2js": "^0.4.0",
- "electron": "22.0.0",
+ "electron": "22.0.3",
"electron-builder": "^22.7.0",
"electron-packager": "^15.1.0",
"electron-winstaller": "^5.0.0",
diff --git a/yarn.lock b/yarn.lock
index 072f16f3f5..518735fa0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -521,22 +521,6 @@
ajv "^6.12.0"
ajv-keywords "^3.4.1"
-"@electron/get@^1.14.1":
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
- integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
- dependencies:
- debug "^4.1.1"
- env-paths "^2.2.0"
- fs-extra "^8.1.0"
- got "^9.6.0"
- progress "^2.0.3"
- semver "^6.2.0"
- sumchecker "^3.0.1"
- optionalDependencies:
- global-agent "^3.0.0"
- global-tunnel-ng "^2.7.1"
-
"@electron/get@^1.6.0":
version "1.7.1"
resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.7.1.tgz#41aa60871b9d7e225bbe68135012f88a9ef87012"
@@ -552,6 +536,21 @@
global-agent "^2.0.2"
global-tunnel-ng "^2.7.1"
+"@electron/get@^2.0.0":
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e"
+ integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==
+ dependencies:
+ debug "^4.1.1"
+ env-paths "^2.2.0"
+ fs-extra "^8.1.0"
+ got "^11.8.5"
+ progress "^2.0.3"
+ semver "^6.2.0"
+ sumchecker "^3.0.1"
+ optionalDependencies:
+ global-agent "^3.0.0"
+
"@es-joy/jsdoccomment@~0.18.0":
version "0.18.0"
resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz#2532b2ecb8576d694011b157c447ed6b12534c70"
@@ -879,6 +878,11 @@
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+"@sindresorhus/is@^4.0.0":
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
+ integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
+
"@sinonjs/commons@^1.7.0":
version "1.8.1"
resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
@@ -900,6 +904,13 @@
dependencies:
defer-to-connect "^1.0.1"
+"@szmarczak/http-timer@^4.0.5":
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
+ integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
+ dependencies:
+ defer-to-connect "^2.0.0"
+
"@tootallnate/once@1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
@@ -953,6 +964,16 @@
dependencies:
"@types/node" "*"
+"@types/cacheable-request@^6.0.1":
+ version "6.0.3"
+ resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
+ integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
+ dependencies:
+ "@types/http-cache-semantics" "*"
+ "@types/keyv" "^3.1.4"
+ "@types/node" "*"
+ "@types/responselike" "^1.0.0"
+
"@types/classnames@^2.2.2":
version "2.2.3"
resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.3.tgz#3f0ff6873da793870e20a260cada55982f38a9e5"
@@ -1108,6 +1129,11 @@
resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==
+"@types/http-cache-semantics@*":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
+ integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
+
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -1173,6 +1199,13 @@
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+"@types/keyv@^3.1.4":
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
+ integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
+ dependencies:
+ "@types/node" "*"
+
"@types/klaw-sync@^6.0.0":
version "6.0.0"
resolved "https://registry.yarnpkg.com/@types/klaw-sync/-/klaw-sync-6.0.0.tgz#ff0b36601efaaa109d513c4ced109311fd06ba36"
@@ -1339,6 +1372,13 @@
resolved "https://registry.yarnpkg.com/@types/reserved-words/-/reserved-words-0.1.0.tgz#a9d5318bb4ac4466862b93fc702542b75d2cd3ac"
integrity sha512-ls6lSkkhEFm8XSVQjHj47pJoCL9sVK91mwIONw0Iwjqkmy98ForMFYa5+/vb6sytTaK0HSwkzKKYzREPTUhhhg==
+"@types/responselike@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
+ integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
+ dependencies:
+ "@types/node" "*"
+
"@types/semver@^5.5.0":
version "5.5.0"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
@@ -2663,6 +2703,11 @@ cache-base@^1.0.1:
union-value "^1.0.0"
unset-value "^1.0.0"
+cacheable-lookup@^5.0.3:
+ version "5.0.4"
+ resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
+ integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
+
cacheable-request@^6.0.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
@@ -2676,6 +2721,19 @@ cacheable-request@^6.0.0:
normalize-url "^4.1.0"
responselike "^1.0.2"
+cacheable-request@^7.0.2:
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
+ integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
+ dependencies:
+ clone-response "^1.0.2"
+ get-stream "^5.1.0"
+ http-cache-semantics "^4.0.0"
+ keyv "^4.0.0"
+ lowercase-keys "^2.0.0"
+ normalize-url "^6.0.1"
+ responselike "^2.0.0"
+
call-bind@^1.0.0, call-bind@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -3236,6 +3294,13 @@ decompress-response@^3.3.0:
dependencies:
mimic-response "^1.0.0"
+decompress-response@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+ integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
+ dependencies:
+ mimic-response "^3.1.0"
+
deep-extend@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
@@ -3261,6 +3326,11 @@ defer-to-connect@^1.0.1:
resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+defer-to-connect@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+ integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
+
define-properties@^1.1.2, define-properties@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -3593,12 +3663,12 @@ electron-winstaller@*, electron-winstaller@^5.0.0:
lodash.template "^4.2.2"
temp "^0.9.0"
-electron@20.0.0:
- version "20.0.0"
- resolved "https://registry.yarnpkg.com/electron/-/electron-20.0.0.tgz#c15a441341380effda071515d8b9c88a11e2a9c4"
- integrity sha512-rPHTdjBKGSoLgGuJVsqDgmK9woDQxzlU18H+3cO4i+fNh29BMbFRwKKyit13lniO1hzRsEJDG5UKvFXs4vEpnA==
+electron@22.0.3:
+ version "22.0.3"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.3.tgz#44806cd053ea2ed35bffefd92143d3fc69d7337d"
+ integrity sha512-eETrJTINTzlXgQrnJSrKiF2Xdt5EHpxZ6Kk+WUjFCE0zUztdVm+hrngUecqhj8TPFlYScTANzPwRwUIjOChl+g==
dependencies:
- "@electron/get" "^1.14.1"
+ "@electron/get" "^2.0.0"
"@types/node" "^16.11.26"
extract-zip "^2.0.1"
@@ -4903,6 +4973,23 @@ globby@^11.0.4, globby@^11.1.0:
merge2 "^1.4.1"
slash "^3.0.0"
+got@^11.8.5:
+ version "11.8.6"
+ resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
+ integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
+ dependencies:
+ "@sindresorhus/is" "^4.0.0"
+ "@szmarczak/http-timer" "^4.0.5"
+ "@types/cacheable-request" "^6.0.1"
+ "@types/responselike" "^1.0.0"
+ cacheable-lookup "^5.0.3"
+ cacheable-request "^7.0.2"
+ decompress-response "^6.0.0"
+ http2-wrapper "^1.0.0-beta.5.2"
+ lowercase-keys "^2.0.0"
+ p-cancelable "^2.0.0"
+ responselike "^2.0.0"
+
got@^9.6.0:
version "9.6.0"
resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
@@ -5191,6 +5278,14 @@ http-signature@~1.2.0:
jsprim "^1.2.2"
sshpk "^1.7.0"
+http2-wrapper@^1.0.0-beta.5.2:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
+ integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
+ dependencies:
+ quick-lru "^5.1.1"
+ resolve-alpn "^1.0.0"
+
https-proxy-agent@^5.0.0:
version "5.0.1"
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
@@ -6333,6 +6428,11 @@ json-buffer@3.0.0:
resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+json-buffer@3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+ integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
json-edm-parser@0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/json-edm-parser/-/json-edm-parser-0.1.2.tgz#1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"
@@ -6480,6 +6580,13 @@ keyv@^3.0.0:
dependencies:
json-buffer "3.0.0"
+keyv@^4.0.0:
+ version "4.5.2"
+ resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
+ integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==
+ dependencies:
+ json-buffer "3.0.1"
+
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
version "3.2.2"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -7004,6 +7111,11 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+mimic-response@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
+ integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
+
mini-css-extract-plugin@^2.5.3:
version "2.5.3"
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.3.tgz#c5c79f9b22ce9b4f164e9492267358dbe35376d9"
@@ -7226,6 +7338,11 @@ normalize-url@^4.1.0:
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
+normalize-url@^6.0.1:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
+ integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
+
npm-conf@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
@@ -7471,6 +7588,11 @@ p-cancelable@^1.0.0:
resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+p-cancelable@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
+ integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
+
p-each-series@^2.1.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
@@ -7968,6 +8090,11 @@ queue-microtask@^1.2.2:
resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+quick-lru@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+ integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+
raf@^3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
@@ -8311,6 +8438,11 @@ reserved-words@^0.1.2:
resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1"
integrity sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=
+resolve-alpn@^1.0.0:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
+ integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
+
resolve-cwd@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -8379,6 +8511,13 @@ responselike@^1.0.2:
dependencies:
lowercase-keys "^1.0.0"
+responselike@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
+ integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==
+ dependencies:
+ lowercase-keys "^2.0.0"
+
ret@~0.1.10:
version "0.1.15"
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
From 7f903a3056f79319c1152895e2670388c29a74ac Mon Sep 17 00:00:00 2001
From: tidy-dev
Date: Tue, 27 Dec 2022 09:11:08 -0500
Subject: [PATCH 52/65] Update Response Type to CallbackResponse Type
---
app/src/main-process/ordered-webrequest.ts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/src/main-process/ordered-webrequest.ts b/app/src/main-process/ordered-webrequest.ts
index b200cdcb58..bcb4494264 100644
--- a/app/src/main-process/ordered-webrequest.ts
+++ b/app/src/main-process/ordered-webrequest.ts
@@ -1,7 +1,7 @@
import {
WebRequest,
OnBeforeRequestListenerDetails,
- Response,
+ CallbackResponse,
OnBeforeSendHeadersListenerDetails,
BeforeSendResponse,
OnCompletedListenerDetails,
@@ -112,7 +112,7 @@ export class OrderedWebRequest {
public readonly onBeforeRequest: AsyncListenerSet<
OnBeforeRequestListenerDetails,
- Response
+ CallbackResponse
>
public readonly onBeforeSendHeaders: AsyncListenerSet<
@@ -140,7 +140,7 @@ export class OrderedWebRequest {
this.onBeforeRequest = new AsyncListenerSet(
webRequest.onBeforeRequest.bind(webRequest),
async (listeners, details) => {
- let response: Response = {}
+ let response: CallbackResponse = {}
for (const listener of listeners) {
response = await listener(details)
From c3437a44698ea4b2d0fbe6da26c7bd493b81f11f Mon Sep 17 00:00:00 2001
From: Shivareddy-Aluri
Date: Mon, 23 Jan 2023 23:27:09 +0530
Subject: [PATCH 53/65] Update repository-settings.tsx
---
.../repository-settings.tsx | 27 ++++++++++---------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/app/src/ui/repository-settings/repository-settings.tsx b/app/src/ui/repository-settings/repository-settings.tsx
index ffe3fe5b89..f381127a5d 100644
--- a/app/src/ui/repository-settings/repository-settings.tsx
+++ b/app/src/ui/repository-settings/repository-settings.tsx
@@ -289,18 +289,21 @@ export class RepositorySettings extends React.Component<
if (this.state.remote && this.props.remote) {
const trimmedUrl = this.state.remote.url.trim()
- try {
- await this.props.dispatcher.setRemoteURL(
- this.props.repository,
- this.props.remote.name,
- trimmedUrl
- )
- } catch (e) {
- log.error(
- `RepositorySettings: unable to set remote URL at ${this.props.repository.path}`,
- e
- )
- errors.push(`Failed setting the remote URL: ${e}`)
+
+ if (trimmedUrl !== this.props.remote.url) {
+ try {
+ await this.props.dispatcher.setRemoteURL(
+ this.props.repository,
+ this.props.remote.name,
+ trimmedUrl
+ )
+ } catch (e) {
+ log.error(
+ `RepositorySettings: unable to set remote URL at ${this.props.repository.path}`,
+ e
+ )
+ errors.push(`Failed setting the remote URL: ${e}`)
+ }
}
}
From 45a8aecc0743dd061f2ce9c3daf346afc7ab10ec Mon Sep 17 00:00:00 2001
From: Steve Ward
Date: Tue, 24 Jan 2023 10:10:14 -0500
Subject: [PATCH 54/65] Update app/src/lib/editors/win32.ts
Co-authored-by: Sergio Padrino
---
app/src/lib/editors/win32.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/lib/editors/win32.ts b/app/src/lib/editors/win32.ts
index 669fb8851b..181ab8ec0d 100644
--- a/app/src/lib/editors/win32.ts
+++ b/app/src/lib/editors/win32.ts
@@ -357,7 +357,7 @@ const editors: WindowsExternalEditor[] = [
registryKeys: [Wow64LocalMachineUninstallKey('RStudio')],
installLocationRegistryKey: 'DisplayIcon',
displayNamePrefix: 'RStudio',
- publisher: 'Posit Software',
+ publishers: ['RStudio', 'Posit Software'],
},
{
name: 'JetBrains IntelliJ Idea',
From b66d481a47f829ef2a34d0b93be71f33b920aaf6 Mon Sep 17 00:00:00 2001
From: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
Date: Wed, 25 Jan 2023 12:57:47 -0500
Subject: [PATCH 55/65] Release 3.1.6-beta1
---
app/package.json | 2 +-
changelog.json | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/app/package.json b/app/package.json
index 7fe8d901eb..ad579c932b 100644
--- a/app/package.json
+++ b/app/package.json
@@ -3,7 +3,7 @@
"productName": "GitHub Desktop",
"bundleID": "com.github.GitHubClient",
"companyName": "GitHub, Inc.",
- "version": "3.1.5",
+ "version": "3.1.6-beta1",
"main": "./main.js",
"repository": {
"type": "git",
diff --git a/changelog.json b/changelog.json
index effc7a8265..04bee6e327 100644
--- a/changelog.json
+++ b/changelog.json
@@ -1,5 +1,12 @@
{
"releases": {
+ "3.1.6-beta1": [
+ "[Added] Add fetch and force-push actions in a dropdown as an alternative to the main Pull/Push/Publish action button - #15907",
+ "[Added] Add JetBrains CLion support on macOS - #15881. Thanks @tsvetilian-ty!",
+ "[Fixed] VSCodium Registry support fixed - #15585. Thanks @voidei!",
+ "[Improved] Upgrade to Electron v22.0.3 - #15831",
+ "[Improved] Upgrade embedded Git to 2.39.1 and Git LFS to 3.3.0 - #15915"
+ ],
"3.1.5": [
"[Added] Enable menu option to Force-push branches that have diverged - #15211",
"[Added] Add menu option to Fetch the current repository at any time - #7805",
From ccacdea6ba649cc236cad9467ada6881c7dda265 Mon Sep 17 00:00:00 2001
From: Sergio Padrino
Date: Thu, 26 Jan 2023 10:05:00 +0100
Subject: [PATCH 56/65] Update changelog.json
---
changelog.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/changelog.json b/changelog.json
index 04bee6e327..d9b680a30d 100644
--- a/changelog.json
+++ b/changelog.json
@@ -3,7 +3,7 @@
"3.1.6-beta1": [
"[Added] Add fetch and force-push actions in a dropdown as an alternative to the main Pull/Push/Publish action button - #15907",
"[Added] Add JetBrains CLion support on macOS - #15881. Thanks @tsvetilian-ty!",
- "[Fixed] VSCodium Registry support fixed - #15585. Thanks @voidei!",
+ "[Fixed] Fix support for latest versions of VSCodium on Windows - #15585. Thanks @voidei!",
"[Improved] Upgrade to Electron v22.0.3 - #15831",
"[Improved] Upgrade embedded Git to 2.39.1 and Git LFS to 3.3.0 - #15915"
],
From 222c0f577883eec742f877f47ef61e546f521341 Mon Sep 17 00:00:00 2001
From: Sergio Padrino
Date: Thu, 26 Jan 2023 10:26:04 +0100
Subject: [PATCH 57/65] Bump expected Electron version to 22.0.3 on beta builds
---
script/validate-electron-version.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/script/validate-electron-version.ts b/script/validate-electron-version.ts
index 46bd8c4310..18494e0c8f 100644
--- a/script/validate-electron-version.ts
+++ b/script/validate-electron-version.ts
@@ -16,7 +16,7 @@ type ChannelToValidate = 'production' | 'beta'
*/
const ValidElectronVersions: Record = {
production: '19.0.0',
- beta: '19.0.0',
+ beta: '22.0.3',
}
const channel = getChannelToValidate()
From 12078e30cf5f5032853adbc3acb844d17f641d19 Mon Sep 17 00:00:00 2001
From: Sergio Padrino
Date: Thu, 26 Jan 2023 15:34:44 +0100
Subject: [PATCH 58/65] Add "allow JIT" entitlement to macOS builds
---
script/entitlements-dev.plist | 2 ++
script/entitlements.plist | 2 ++
2 files changed, 4 insertions(+)
diff --git a/script/entitlements-dev.plist b/script/entitlements-dev.plist
index 374fef149d..985c9eba95 100644
--- a/script/entitlements-dev.plist
+++ b/script/entitlements-dev.plist
@@ -8,5 +8,7 @@
com.apple.security.cs.disable-library-validation
+ com.apple.security.cs.allow-jit
+
diff --git a/script/entitlements.plist b/script/entitlements.plist
index 80e73892e6..7d3263efd9 100644
--- a/script/entitlements.plist
+++ b/script/entitlements.plist
@@ -6,5 +6,7 @@
com.apple.security.automation.apple-events
+ com.apple.security.cs.allow-jit
+
From bce5000e437db3c65a6c2284dbcba9effb141891 Mon Sep 17 00:00:00 2001
From: Sergio Padrino
Date: Thu, 26 Jan 2023 16:04:27 +0100
Subject: [PATCH 59/65] Bump changelog and version to 3.1.6-beta2
---
app/package.json | 2 +-
changelog.json | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/package.json b/app/package.json
index ad579c932b..bbe9548fee 100644
--- a/app/package.json
+++ b/app/package.json
@@ -3,7 +3,7 @@
"productName": "GitHub Desktop",
"bundleID": "com.github.GitHubClient",
"companyName": "GitHub, Inc.",
- "version": "3.1.6-beta1",
+ "version": "3.1.6-beta2",
"main": "./main.js",
"repository": {
"type": "git",
diff --git a/changelog.json b/changelog.json
index d9b680a30d..8ca68230f3 100644
--- a/changelog.json
+++ b/changelog.json
@@ -1,5 +1,10 @@
{
"releases": {
+ "3.1.6-beta2": [
+ "[Fixed] Fix crash launching the app on Apple silicon devices - #16011",
+ "[Fixed] Trim leading and trailing whitespaces in URLs of repository remotes - #15821. Thanks @Shivareddy-Aluri!",
+ "[Fixed] Fix support for the latest versions of RStudio on Windows - #15810"
+ ],
"3.1.6-beta1": [
"[Added] Add fetch and force-push actions in a dropdown as an alternative to the main Pull/Push/Publish action button - #15907",
"[Added] Add JetBrains CLion support on macOS - #15881. Thanks @tsvetilian-ty!",
From 13332ca8e300224162599dc855e919231499636d Mon Sep 17 00:00:00 2001
From: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
Date: Fri, 27 Jan 2023 10:17:15 -0500
Subject: [PATCH 60/65] Check for content
---
app/src/ui/history/commit-summary.tsx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index 3799d96262..01f59cc0a1 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -553,6 +553,9 @@ export class CommitSummary extends React.Component<
}
}
+ const hasFileDescription =
+ filesAdded + filesModified + filesRemoved + filesRemoved > 0
+
const filesLongDescription = (
<>
{filesAdded > 0 ? (
@@ -598,7 +601,9 @@ export class CommitSummary extends React.Component<
0 ? filesLongDescription : undefined}
+ tooltip={
+ fileCount > 0 && hasFileDescription ? filesLongDescription : undefined
+ }
>
{filesShortDescription}
From 63592700cf311b34ec5b3fd711f2099412d0b8d2 Mon Sep 17 00:00:00 2001
From: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
Date: Fri, 27 Jan 2023 10:52:12 -0500
Subject: [PATCH 61/65] Need each one..
Co-authored-by: Sergio Padrino
---
app/src/ui/history/commit-summary.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index 01f59cc0a1..e342225d71 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -554,7 +554,7 @@ export class CommitSummary extends React.Component<
}
const hasFileDescription =
- filesAdded + filesModified + filesRemoved + filesRemoved > 0
+ filesAdded + filesModified + filesRemoved + filesRenamed > 0
const filesLongDescription = (
<>
From b37a25a88e3cf140337ad6879609c82a28d427c6 Mon Sep 17 00:00:00 2001
From: Brendan Forster
Date: Sun, 29 Jan 2023 16:36:00 -0400
Subject: [PATCH 62/65] Add support for numerous additional editors on Linux
- Kate
- gEdit
- Notepadqq
- GNOME Text Editor
- GNOME Builder
- VSCode (from WSL)
- Geany
- Mousepad
Co-Authored-By: gwyn <29720696+avalonv@users.noreply.github.com>
Co-Authored-By: PadowYT2 <71085027+PadowYT2@users.noreply.github.com>
Co-Authored-By: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
Co-Authored-By: Amin Yahyaabadi <16418197+aminya@users.noreply.github.com>
Co-Authored-By: Etaash Mathamsetty <45927311+Etaash-mathamsetty@users.noreply.github.com>
Co-Authored-By: Richard Kellnberger <5147221+Richardk2n@users.noreply.github.com>
Co-Authored-By: Sky Barnes <429099+tsbarnes@users.noreply.github.com>
---
app/src/lib/editors/linux.ts | 53 ++++++++++++++++++++++++++++++++++--
1 file changed, 51 insertions(+), 2 deletions(-)
diff --git a/app/src/lib/editors/linux.ts b/app/src/lib/editors/linux.ts
index 0670548b44..8136ac932c 100644
--- a/app/src/lib/editors/linux.ts
+++ b/app/src/lib/editors/linux.ts
@@ -23,9 +23,26 @@ const editors: ILinuxExternalEditor[] = [
name: 'Neovim',
paths: ['/usr/bin/nvim'],
},
+ {
+ name: 'Neovim-Qt',
+ paths: ['/usr/bin/nvim-qt'],
+ },
+ {
+ name: 'Neovide',
+ paths: ['/usr/bin/neovide'],
+ },
+ {
+ name: 'gVim',
+ paths: ['/usr/bin/gvim'],
+ },
{
name: 'Visual Studio Code',
- paths: ['/usr/share/code/bin/code', '/snap/bin/code', '/usr/bin/code'],
+ paths: [
+ '/usr/share/code/bin/code',
+ '/snap/bin/code',
+ '/usr/bin/code',
+ '/mnt/c/Program Files/Microsoft VS Code/bin/code',
+ ],
},
{
name: 'Visual Studio Code (Insiders)',
@@ -33,7 +50,11 @@ const editors: ILinuxExternalEditor[] = [
},
{
name: 'VSCodium',
- paths: ['/usr/bin/codium', '/var/lib/flatpak/app/com.vscodium.codium'],
+ paths: [
+ '/usr/bin/codium',
+ '/var/lib/flatpak/app/com.vscodium.codium',
+ '/usr/share/vscodium-bin/bin/codium',
+ ],
},
{
name: 'Sublime Text',
@@ -74,6 +95,34 @@ const editors: ILinuxExternalEditor[] = [
name: 'Emacs',
paths: ['/snap/bin/emacs', '/usr/local/bin/emacs', '/usr/bin/emacs'],
},
+ {
+ name: 'Kate',
+ paths: ['/usr/bin/kate'],
+ },
+ {
+ name: 'GEdit',
+ paths: ['/usr/bin/gedit'],
+ },
+ {
+ name: 'GNOME Text Editor',
+ paths: ['/usr/bin/gnome-text-editor'],
+ },
+ {
+ name: 'GNOME Builder',
+ paths: ['/usr/bin/gnome-builder'],
+ },
+ {
+ name: 'Notepadqq',
+ paths: ['/usr/bin/notepadqq'],
+ },
+ {
+ name: 'Geany',
+ paths: ['/usr/bin/geany'],
+ },
+ {
+ name: 'Mousepad',
+ paths: ['/usr/bin/mousepad'],
+ },
]
async function getAvailablePath(paths: string[]): Promise {
From 89c4daa00a40d054513ea6fb65929c639dfc7b8f Mon Sep 17 00:00:00 2001
From: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
Date: Wed, 1 Feb 2023 13:03:30 -0500
Subject: [PATCH 63/65] Add axeDevTools extension
---
app/src/main-process/main.ts | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/app/src/main-process/main.ts b/app/src/main-process/main.ts
index 75a889f5f6..bef7e254ea 100644
--- a/app/src/main-process/main.ts
+++ b/app/src/main-process/main.ts
@@ -729,7 +729,13 @@ function createWindow() {
electron: '>=1.2.1',
}
- const extensions = [REACT_DEVELOPER_TOOLS, ChromeLens]
+ const axeDevTools = {
+ id: 'lhdoppojpmngadmnindnejefpokejbdd',
+ electron: '>=1.2.1',
+ Permissions: ['tabs', 'debugger'],
+ }
+
+ const extensions = [REACT_DEVELOPER_TOOLS, ChromeLens, axeDevTools]
for (const extension of extensions) {
try {
From 421f7835b6f34f762a147fa33fb7e0697b17f374 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 17:33:28 +0000
Subject: [PATCH 64/65] Bump jszip from 3.7.1 to 3.8.0
Bumps [jszip](https://github.com/Stuk/jszip) from 3.7.1 to 3.8.0.
- [Release notes](https://github.com/Stuk/jszip/releases)
- [Changelog](https://github.com/Stuk/jszip/blob/main/CHANGES.md)
- [Commits](https://github.com/Stuk/jszip/compare/v3.7.1...v3.8.0)
---
updated-dependencies:
- dependency-name: jszip
dependency-type: direct:production
...
Signed-off-by: dependabot[bot]
---
package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 5e0e53586b..e5ac739268 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"jest-diff": "^25.0.0",
"jest-extended": "^0.11.2",
"jest-localstorage-mock": "^2.3.0",
- "jszip": "^3.7.1",
+ "jszip": "^3.8.0",
"klaw-sync": "^3.0.0",
"legal-eagle": "0.16.0",
"mini-css-extract-plugin": "^2.5.3",
diff --git a/yarn.lock b/yarn.lock
index a9dab1caa2..a47efb4319 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6558,10 +6558,10 @@ jsx-ast-utils@^3.3.2:
array-includes "^3.1.5"
object.assign "^4.1.3"
-jszip@^3.7.1:
- version "3.7.1"
- resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
- integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
+jszip@^3.8.0:
+ version "3.8.0"
+ resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.8.0.tgz#a2ac3c33fe96a76489765168213655850254d51b"
+ integrity sha512-cnpQrXvFSLdsR9KR5/x7zdf6c3m8IhZfZzSblFEHSqBaVwD2nvJ4CuCKLyvKvwBgZm08CgfSoiTBQLm5WW9hGw==
dependencies:
lie "~3.3.0"
pako "~1.0.2"
From 3a0af15c24bcabd1ec41a13071ceac6eef0199c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Feb 2023 05:13:06 +0000
Subject: [PATCH 65/65] Bump http-cache-semantics from 4.1.0 to 4.1.1
Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1)
---
updated-dependencies:
- dependency-name: http-cache-semantics
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
---
yarn.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/yarn.lock b/yarn.lock
index a9dab1caa2..ea0d09b0f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5245,9 +5245,9 @@ htmlparser2@^6.1.0:
entities "^2.0.0"
http-cache-semantics@^4.0.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
- integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+ integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
http-errors@1.8.1:
version "1.8.1"