From 0e1e9b86b4864627b47466140870ec031395eb56 Mon Sep 17 00:00:00 2001 From: evelyn masso Date: Mon, 11 May 2020 10:43:14 -0700 Subject: [PATCH 01/22] release notes --- app/package.json | 2 +- changelog.json | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 2f99b984e52..7046bff7f13 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "2.4.4-beta4", + "version": "2.5.0", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index 3cd79db4502..b9083f7219c 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,15 @@ { "releases": { + "2.5.0": [ + "[New] Add, push, and view git tags in Desktop - #9424", + "[Added] Offer option to choose file from one branch or the other when resolving merge conflicts - #9702", + "[Added] Add context menu for highlighted text in diff view - #5100. Thanks @HashimotoYT!", + "[Fixed] Retain default branch option in \"Create Branch\" dialog when user focuses away from Desktop - #9611", + "[Improved] Clean up copy for onboarding sign-in flow - #9715", + "[Improved] Emphasize sign in via browser option in Welcome flow - #9663", + "[Improved] Update verbage in repository publish error - #9646", + "[Improved] Offer to retry cloning if it fails - #926. Thanks @Daniel-McCarthy!" + ], "2.4.4-beta4": [ "[Fixed] Add missing \"Cancel\" button in onboarding sign-in flow - #9715", "[Improved] Update copy for onboarding sign-in flow - #9715" From 8b409541f582c554124f7ff9f5fb0639fade845b Mon Sep 17 00:00:00 2001 From: evelyn masso Date: Mon, 11 May 2020 13:35:30 -0700 Subject: [PATCH 02/22] revisions Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com> --- changelog.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog.json b/changelog.json index b9083f7219c..afcda50d1c2 100644 --- a/changelog.json +++ b/changelog.json @@ -1,14 +1,14 @@ { "releases": { "2.5.0": [ - "[New] Add, push, and view git tags in Desktop - #9424", + "[New] Add, push, and view Git tags on commit history in Desktop - #9424", "[Added] Offer option to choose file from one branch or the other when resolving merge conflicts - #9702", "[Added] Add context menu for highlighted text in diff view - #5100. Thanks @HashimotoYT!", "[Fixed] Retain default branch option in \"Create Branch\" dialog when user focuses away from Desktop - #9611", "[Improved] Clean up copy for onboarding sign-in flow - #9715", "[Improved] Emphasize sign in via browser option in Welcome flow - #9663", - "[Improved] Update verbage in repository publish error - #9646", - "[Improved] Offer to retry cloning if it fails - #926. Thanks @Daniel-McCarthy!" + "[Improved] Improve error message when publishing a private repository fails - #9646", + "[Improved] Offer to retry if cloning a repository fails - #926. Thanks @Daniel-McCarthy!" ], "2.4.4-beta4": [ "[Fixed] Add missing \"Cancel\" button in onboarding sign-in flow - #9715", From 736ef36605adafe4da19b322a87a05c9afab837d Mon Sep 17 00:00:00 2001 From: evelyn masso Date: Mon, 11 May 2020 14:16:32 -0700 Subject: [PATCH 03/22] context Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com> --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index afcda50d1c2..971f0cc8582 100644 --- a/changelog.json +++ b/changelog.json @@ -6,7 +6,7 @@ "[Added] Add context menu for highlighted text in diff view - #5100. Thanks @HashimotoYT!", "[Fixed] Retain default branch option in \"Create Branch\" dialog when user focuses away from Desktop - #9611", "[Improved] Clean up copy for onboarding sign-in flow - #9715", - "[Improved] Emphasize sign in via browser option in Welcome flow - #9663", + "[Improved] Emphasize signing in to GitHub via browser due to username/password deprecation - #9663", "[Improved] Improve error message when publishing a private repository fails - #9646", "[Improved] Offer to retry if cloning a repository fails - #926. Thanks @Daniel-McCarthy!" ], From 021addc353e365d58ca70cc91fefcca64e7ec493 Mon Sep 17 00:00:00 2001 From: Rafael Oleza Date: Tue, 12 May 2020 16:38:05 +0200 Subject: [PATCH 04/22] Wrap call to get all tags with performFailableOperation() This will prevent git errors affect other push/pull operations --- app/src/lib/stores/git-store.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts index 797a4e97b03..2a7c137d11a 100644 --- a/app/src/lib/stores/git-store.ts +++ b/app/src/lib/stores/git-store.ts @@ -265,7 +265,15 @@ export class GitStore extends BaseStore { public async refreshTags() { const previousTags = this._localTags - this._localTags = await getAllTags(this.repository) + const newTags = await this.performFailableOperation(() => + getAllTags(this.repository) + ) + + if (newTags === undefined) { + return + } + + this._localTags = newTags if (previousTags !== null) { // We don't await for the emition of updates to finish From 1034b8ac957e85c4bbdc0a712b504a53d7ce7143 Mon Sep 17 00:00:00 2001 From: evelyn masso Date: Tue, 12 May 2020 09:14:46 -0700 Subject: [PATCH 05/22] move moment plugin setup --- app/src/ui/index.tsx | 7 +++++++ app/src/ui/relative-time.tsx | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/ui/index.tsx b/app/src/ui/index.tsx index 9287817313c..da09e961d3e 100644 --- a/app/src/ui/index.tsx +++ b/app/src/ui/index.tsx @@ -4,6 +4,8 @@ import * as React from 'react' import * as ReactDOM from 'react-dom' import * as Path from 'path' +import * as moment from 'moment' + import { ipcRenderer, remote } from 'electron' import { App } from './app' @@ -86,6 +88,11 @@ process.env['LOCAL_GIT_DIRECTORY'] = Path.resolve(__dirname, 'git') // Focus Ring! -- A11ycasts #16: https://youtu.be/ilj2P5-5CjI require('wicg-focus-ring') +// setup this moment.js plugin so we can use easier +// syntax for formatting time duration +const momentDurationFormatSetup = require('moment-duration-format') +momentDurationFormatSetup(moment) + const startTime = performance.now() if (!process.env.TEST_ENV) { diff --git a/app/src/ui/relative-time.tsx b/app/src/ui/relative-time.tsx index 4454efb9ba4..3a709d3c338 100644 --- a/app/src/ui/relative-time.tsx +++ b/app/src/ui/relative-time.tsx @@ -1,9 +1,5 @@ import * as React from 'react' import * as moment from 'moment' -const momentDurationFormatSetup = require('moment-duration-format') - -// setup moment plugin -momentDurationFormatSetup(moment) interface IRelativeTimeProps { /** From 0ced1911c08a0fb390789a1bac493189d62c6756 Mon Sep 17 00:00:00 2001 From: Billy Griffin <5091167+billygriffin@users.noreply.github.com> Date: Tue, 12 May 2020 11:43:23 -0600 Subject: [PATCH 06/22] Swap whitelist for allowlist and blacklist for denylist --- app/src/lib/shell.ts | 4 ++-- docs/known-issues.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/lib/shell.ts b/app/src/lib/shell.ts index 062f762ef14..68edebc521d 100644 --- a/app/src/lib/shell.ts +++ b/app/src/lib/shell.ts @@ -10,7 +10,7 @@ type IndexLookup = { /** * The names of any env vars that we shouldn't copy from the shell environment. */ -const BlacklistedNames = new Set(['LOCAL_GIT_DIRECTORY']) +const DenylistedNames = new Set(['LOCAL_GIT_DIRECTORY']) /** * Inspect whether the current process needs to be patched to get important @@ -152,7 +152,7 @@ async function getEnvironmentFromShell( */ function mergeEnvironmentVariables(env: IndexLookup) { for (const key in env) { - if (BlacklistedNames.has(key)) { + if (DenylistedNames.has(key)) { continue } diff --git a/docs/known-issues.md b/docs/known-issues.md index 0b7f1fb6a8e..3735558ba2f 100644 --- a/docs/known-issues.md +++ b/docs/known-issues.md @@ -114,7 +114,7 @@ are unable to find another cygwin DLL. Enabling Mandatory ASLR affects the MSYS2 core library, which is relied upon by Git for Windows to emulate process forking. -**Not supported:** this is an upstream limitation of MSYS2, and it is recommend that you either disable Mandatory ASLR or whitelist all executables under `\usr\bin` which depend on MSYS2. +**Not supported:** this is an upstream limitation of MSYS2, and it is recommend that you either disable Mandatory ASLR or allowlist all executables under `\usr\bin` which depend on MSYS2. ### I get a black screen when launching Desktop From 19cc54abba6bd9a3e3b45fe572d5ce8190c39104 Mon Sep 17 00:00:00 2001 From: evelyn masso Date: Tue, 12 May 2020 13:06:30 -0700 Subject: [PATCH 07/22] ensure that we don't block the git auth error handler on cloning --- app/src/ui/dispatcher/error-handlers.ts | 11 ++++++++++- app/src/ui/index.tsx | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/ui/dispatcher/error-handlers.ts b/app/src/ui/dispatcher/error-handlers.ts index 1bf3fc70910..026033b1887 100644 --- a/app/src/ui/dispatcher/error-handlers.ts +++ b/app/src/ui/dispatcher/error-handlers.ts @@ -188,7 +188,10 @@ export async function gitAuthenticationErrorHandler( return null } -/** Handle git clone errors to give chance to retry error. */ +/** + * Handle git clone errors to give chance to retry error. + * Doesn't handle auth errors. + */ export async function gitCloneErrorHandler( error: Error, dispatcher: Dispatcher @@ -207,6 +210,12 @@ export async function gitCloneErrorHandler( return error } + const dugiteError = gitError.result.gitError + // don't catch this if this its an auth error + if (dugiteError !== null && AuthenticationErrors.has(dugiteError)) { + return error + } + const repository = e.metadata.repository if (!repository) { return error diff --git a/app/src/ui/index.tsx b/app/src/ui/index.tsx index 9287817313c..34e8e3b51a5 100644 --- a/app/src/ui/index.tsx +++ b/app/src/ui/index.tsx @@ -277,6 +277,7 @@ const dispatcher = new Dispatcher( ) dispatcher.registerErrorHandler(defaultErrorHandler) +dispatcher.registerErrorHandler(gitCloneErrorHandler) dispatcher.registerErrorHandler(upstreamAlreadyExistsHandler) dispatcher.registerErrorHandler(externalEditorErrorHandler) dispatcher.registerErrorHandler(openShellErrorHandler) @@ -292,7 +293,6 @@ dispatcher.registerErrorHandler(missingRepositoryHandler) dispatcher.registerErrorHandler(localChangesOverwrittenHandler) dispatcher.registerErrorHandler(rebaseConflictsHandler) dispatcher.registerErrorHandler(refusedWorkflowUpdate) -dispatcher.registerErrorHandler(gitCloneErrorHandler) document.body.classList.add(`platform-${process.platform}`) From e9818405ca082d2edfd99e37b50430ad92007f9c Mon Sep 17 00:00:00 2001 From: Rafael Oleza Date: Wed, 13 May 2020 13:46:00 +0200 Subject: [PATCH 08/22] Center tags text vertically in history view --- app/styles/ui/history/_commit-list.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/styles/ui/history/_commit-list.scss b/app/styles/ui/history/_commit-list.scss index 2c7b984e402..1af884789da 100644 --- a/app/styles/ui/history/_commit-list.scss +++ b/app/styles/ui/history/_commit-list.scss @@ -50,6 +50,7 @@ margin-left: var(--spacing); color: var(--list-item-badge-color); height: 16px; + line-height: 16px; max-width: 50%; .tag-indicator { From eeaee7e3589af08829b33b2069416d1b75b97f09 Mon Sep 17 00:00:00 2001 From: Rafael Oleza Date: Wed, 13 May 2020 15:26:53 +0200 Subject: [PATCH 09/22] Move windows scrollbars on lists slightly to the right --- app/styles/ui/_list.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/styles/ui/_list.scss b/app/styles/ui/_list.scss index dd1f0d57694..00cf07c9764 100644 --- a/app/styles/ui/_list.scss +++ b/app/styles/ui/_list.scss @@ -51,8 +51,8 @@ // Positioning position: absolute; top: 0px; - right: 3px; - width: 15px; + right: 1px; + width: 12px; // Only support vertical scrolling for now overflow-y: auto; From 0a88447d2eb782c5806b830ccda23665c7bc48ec Mon Sep 17 00:00:00 2001 From: Rafael Oleza Date: Wed, 13 May 2020 15:27:46 +0200 Subject: [PATCH 10/22] Make sure that tag names do not overlap with scrollbars --- app/styles/ui/history/_commit-list.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/styles/ui/history/_commit-list.scss b/app/styles/ui/history/_commit-list.scss index 2c7b984e402..fd87b2d917a 100644 --- a/app/styles/ui/history/_commit-list.scss +++ b/app/styles/ui/history/_commit-list.scss @@ -16,7 +16,9 @@ border-bottom: var(--base-border); - padding: 0 var(--spacing); + // We need to give a bit more padding to the right to make place for the scrollbar + padding-right: calc(var(--spacing) + var(--spacing-half)); + padding-left: var(--spacing); .info { display: flex; From c79a795eadb48b92ceb3a1304a96bf47b8b06b05 Mon Sep 17 00:00:00 2001 From: Rafael Oleza Date: Wed, 13 May 2020 15:30:17 +0200 Subject: [PATCH 11/22] Make sure that repository indicators do no overlap with scrollbars --- app/styles/ui/_repository-list.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/styles/ui/_repository-list.scss b/app/styles/ui/_repository-list.scss index a73587e4499..6409b57c0ce 100644 --- a/app/styles/ui/_repository-list.scss +++ b/app/styles/ui/_repository-list.scss @@ -71,6 +71,7 @@ display: flex; justify-content: flex-end; align-items: center; + margin-right: var(--spacing-half); } .change-indicator-wrapper { From 6f736516677a9da45d7fa85b84fbb5375942e812 Mon Sep 17 00:00:00 2001 From: Rafael Oleza Date: Wed, 13 May 2020 15:52:29 +0200 Subject: [PATCH 12/22] Use all width on commit list when there are no indicators --- app/src/ui/history/commit-list-item.tsx | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/app/src/ui/history/commit-list-item.tsx b/app/src/ui/history/commit-list-item.tsx index 96d05a43b4d..c02c5cfa105 100644 --- a/app/src/ui/history/commit-list-item.tsx +++ b/app/src/ui/history/commit-list-item.tsx @@ -89,15 +89,30 @@ export class CommitListItem extends React.PureComponent< -
- {enableGitTagsDisplay() && - renderCommitListItemTags(this.props.commit.tags)} - {this.renderUnpushedIndicator()} -
+ {this.renderCommitIndicators()} ) } + private renderCommitIndicators() { + const tagIndicator = enableGitTagsDisplay() + ? renderCommitListItemTags(this.props.commit.tags) + : null + + const unpushedIndicator = this.renderUnpushedIndicator() + + if (tagIndicator || unpushedIndicator) { + return ( +
+ {tagIndicator} + {unpushedIndicator} +
+ ) + } + + return null + } + private renderUnpushedIndicator() { if (!this.props.showUnpushedIndicator) { return null From ad65aebc34fffcef729ce8ac8dee742f1a5fb5bf Mon Sep 17 00:00:00 2001 From: Billy Griffin <5091167+billygriffin@users.noreply.github.com> Date: Wed, 13 May 2020 15:02:47 -0600 Subject: [PATCH 13/22] Moar explicit Co-authored-by: Markus Olsson --- docs/known-issues.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/known-issues.md b/docs/known-issues.md index 3735558ba2f..27beb9c4e33 100644 --- a/docs/known-issues.md +++ b/docs/known-issues.md @@ -114,7 +114,7 @@ are unable to find another cygwin DLL. Enabling Mandatory ASLR affects the MSYS2 core library, which is relied upon by Git for Windows to emulate process forking. -**Not supported:** this is an upstream limitation of MSYS2, and it is recommend that you either disable Mandatory ASLR or allowlist all executables under `\usr\bin` which depend on MSYS2. +**Not supported:** this is an upstream limitation of MSYS2, and it is recommend that you either disable Mandatory ASLR or explicitly allow all executables under `\usr\bin` which depend on MSYS2. ### I get a black screen when launching Desktop From 1c062b142c0527064ab6a76a3d4be83b6a8e420b Mon Sep 17 00:00:00 2001 From: Billy Griffin <5091167+billygriffin@users.noreply.github.com> Date: Wed, 13 May 2020 15:03:26 -0600 Subject: [PATCH 14/22] Naming is hard Co-authored-by: Markus Olsson --- app/src/lib/shell.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/shell.ts b/app/src/lib/shell.ts index 68edebc521d..c5610388c27 100644 --- a/app/src/lib/shell.ts +++ b/app/src/lib/shell.ts @@ -10,7 +10,7 @@ type IndexLookup = { /** * The names of any env vars that we shouldn't copy from the shell environment. */ -const DenylistedNames = new Set(['LOCAL_GIT_DIRECTORY']) +const ExcludedEnvironmentVars = new Set(['LOCAL_GIT_DIRECTORY']) /** * Inspect whether the current process needs to be patched to get important From f355158ef3f646747a056cbab2d65d47ca765413 Mon Sep 17 00:00:00 2001 From: Billy Griffin <5091167+billygriffin@users.noreply.github.com> Date: Wed, 13 May 2020 15:03:47 -0600 Subject: [PATCH 15/22] Whoops meant to batch, naming still hard Co-authored-by: Markus Olsson --- app/src/lib/shell.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/shell.ts b/app/src/lib/shell.ts index c5610388c27..2420a232bbe 100644 --- a/app/src/lib/shell.ts +++ b/app/src/lib/shell.ts @@ -152,7 +152,7 @@ async function getEnvironmentFromShell( */ function mergeEnvironmentVariables(env: IndexLookup) { for (const key in env) { - if (DenylistedNames.has(key)) { + if (ExcludedEnvironmentVars.has(key)) { continue } From 24880a1a6c78aac339ff439b3a0efacd4117e3aa Mon Sep 17 00:00:00 2001 From: Rafael Oleza Date: Thu, 14 May 2020 11:59:16 +0200 Subject: [PATCH 16/22] Add --no-verify arg to git push --no-dry to avoid executing hooks --- app/src/lib/git/tag.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/lib/git/tag.ts b/app/src/lib/git/tag.ts index 0fdd0b8a48b..fe883868f2e 100644 --- a/app/src/lib/git/tag.ts +++ b/app/src/lib/git/tag.ts @@ -84,6 +84,7 @@ export async function fetchTagsToPush( branchName, '--follow-tags', '--dry-run', + '--no-verify', '--porcelain', ] From f3be1dc83e9e085ae4baaaadfc2d0ae0069294a2 Mon Sep 17 00:00:00 2001 From: ruggi99 Date: Thu, 14 May 2020 16:18:18 +0200 Subject: [PATCH 17/22] Set tabIndex to undefined (not 0) when a tab bar is selected --- app/src/ui/tab-bar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/tab-bar.tsx b/app/src/ui/tab-bar.tsx index 6e3800809dd..042f43ed27e 100644 --- a/app/src/ui/tab-bar.tsx +++ b/app/src/ui/tab-bar.tsx @@ -160,7 +160,7 @@ class TabBarItem extends React.Component { onClick={this.onClick} role="tab" aria-selected={selected} - tabIndex={selected ? 0 : -1} + tabIndex={selected ? undefined : -1} onKeyDown={this.onKeyDown} type="button" > From 8a17f1253db3f334ea29f7b7908b8dde65e6f510 Mon Sep 17 00:00:00 2001 From: evelyn masso Date: Thu, 14 May 2020 12:53:19 -0700 Subject: [PATCH 18/22] release notes --- 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 7046bff7f13..fca8887fe99 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "2.5.0", + "version": "2.5.1-beta1", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index 971f0cc8582..f0187154ac9 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,10 @@ { "releases": { + "2.5.1-beta1": [ + "[Fixed] Center tags text vertically in history view - #9785", + "[Fixed] Prevent git authentication errors from showing clone retry error handler instead of credentials form - #9777", + "[Improved] Avoid executing unwanted git hooks when fetching unpushed tags - #9793" + ], "2.5.0": [ "[New] Add, push, and view Git tags on commit history in Desktop - #9424", "[Added] Offer option to choose file from one branch or the other when resolving merge conflicts - #9702", From 6e7fd2f56964d6447d58ef5a69ed62f0bef7a853 Mon Sep 17 00:00:00 2001 From: Billy Griffin <5091167+billygriffin@users.noreply.github.com> Date: Thu, 14 May 2020 15:01:27 -0600 Subject: [PATCH 19/22] Update changelog.json --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index f0187154ac9..1e823142660 100644 --- a/changelog.json +++ b/changelog.json @@ -2,7 +2,7 @@ "releases": { "2.5.1-beta1": [ "[Fixed] Center tags text vertically in history view - #9785", - "[Fixed] Prevent git authentication errors from showing clone retry error handler instead of credentials form - #9777", + "[Fixed] Prevent Git authentication errors from prompting to retry clone instead of authentication dialog - #9777", "[Improved] Avoid executing unwanted git hooks when fetching unpushed tags - #9793" ], "2.5.0": [ From 32c0705ae034ee19c9178a5b45f48df161aa08e1 Mon Sep 17 00:00:00 2001 From: Billy Griffin <5091167+billygriffin@users.noreply.github.com> Date: Thu, 14 May 2020 15:01:33 -0600 Subject: [PATCH 20/22] Update changelog.json --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index 1e823142660..340ff55383f 100644 --- a/changelog.json +++ b/changelog.json @@ -1,7 +1,7 @@ { "releases": { "2.5.1-beta1": [ - "[Fixed] Center tags text vertically in history view - #9785", + "[Fixed] Center tags text vertically in History view - #9785", "[Fixed] Prevent Git authentication errors from prompting to retry clone instead of authentication dialog - #9777", "[Improved] Avoid executing unwanted git hooks when fetching unpushed tags - #9793" ], From 79e927c2b93a2f1608d9bc4dd98b607ee3c35430 Mon Sep 17 00:00:00 2001 From: Billy Griffin <5091167+billygriffin@users.noreply.github.com> Date: Thu, 14 May 2020 15:01:40 -0600 Subject: [PATCH 21/22] Update changelog.json --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index 340ff55383f..9abec30445c 100644 --- a/changelog.json +++ b/changelog.json @@ -3,7 +3,7 @@ "2.5.1-beta1": [ "[Fixed] Center tags text vertically in History view - #9785", "[Fixed] Prevent Git authentication errors from prompting to retry clone instead of authentication dialog - #9777", - "[Improved] Avoid executing unwanted git hooks when fetching unpushed tags - #9793" + "[Improved] Avoid executing unwanted Git hooks when fetching unpushed tags - #9793" ], "2.5.0": [ "[New] Add, push, and view Git tags on commit history in Desktop - #9424", From 59329a49e4a0279f9380462ff82bfb9af3d34ad3 Mon Sep 17 00:00:00 2001 From: evelyn masso Date: Fri, 15 May 2020 15:14:29 -0700 Subject: [PATCH 22/22] unship nddb from beta + dev --- app/src/lib/feature-flag.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index 26883aa0788..738a30034c4 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -169,7 +169,7 @@ export function enableForkyCreateBranchUI(): boolean { * are new commits upstream.) */ export function enableNDDBBanner(): boolean { - return enableBetaFeatures() + return false } /**