mirror of
https://github.com/desktop/desktop
synced 2024-09-13 21:31:32 +00:00
Merge pull request #14957 from desktop/releases/3.0.4-beta1
Release 3.0.4-beta1
This commit is contained in:
commit
2944bf7dd7
|
@ -30,7 +30,7 @@
|
|||
"desktop-trampoline": "desktop/desktop-trampoline#v0.9.8",
|
||||
"dexie": "^3.2.2",
|
||||
"dompurify": "^2.3.3",
|
||||
"dugite": "^1.109.0",
|
||||
"dugite": "^1.110.0",
|
||||
"electron-window-state": "^5.0.3",
|
||||
"event-kit": "^2.0.0",
|
||||
"focus-trap-react": "^8.1.0",
|
||||
|
|
|
@ -429,6 +429,7 @@ function getDescriptionForError(error: DugiteError): string | null {
|
|||
case DugiteError.ConflictModifyDeletedInBranch:
|
||||
case DugiteError.MergeCommitNoMainlineOption:
|
||||
case DugiteError.UnsafeDirectory:
|
||||
case DugiteError.PathExistsButNotInRef:
|
||||
return null
|
||||
default:
|
||||
return assertNever(error, `Unknown error: ${error}`)
|
||||
|
|
|
@ -37,7 +37,7 @@ export async function getRepositoryType(path: string): Promise<RepositoryType> {
|
|||
}
|
||||
|
||||
const unsafeMatch =
|
||||
/fatal: unsafe repository \('(.+)\' is owned by someone else\)/.exec(
|
||||
/fatal: detected dubious ownership in repository at '(.+)\' /.exec(
|
||||
result.stderr
|
||||
)
|
||||
if (unsafeMatch) {
|
||||
|
|
|
@ -433,10 +433,10 @@ dompurify@^2.3.3:
|
|||
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.3.tgz#c1af3eb88be47324432964d8abc75cf4b98d634c"
|
||||
integrity sha512-dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg==
|
||||
|
||||
dugite@^1.109.0:
|
||||
version "1.109.0"
|
||||
resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.109.0.tgz#662f726befeefb47b697d6e08f940be865699b74"
|
||||
integrity sha512-pPAs67j/sF6Y84pfI94VOtjMtCxX17OaNOggP+pJAZ4sA53OvcQj2zPgk87EnZaZoOmQYa0EdlH/tsEQhc+wVA==
|
||||
dugite@^1.110.0:
|
||||
version "1.110.0"
|
||||
resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.110.0.tgz#3db86bf66d3690fdbcf83c59575563909b79d27f"
|
||||
integrity sha512-JPHd07QYajpUWJmZdeQSuuRL+OZ92tAWZvDqI+EJdETuwgNmMh+OyyXOaBcuGnlPznWEppQaHaEAEEqLdF9W/Q==
|
||||
dependencies:
|
||||
checksum "^0.1.1"
|
||||
got "^9.6.0"
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"releases": {
|
||||
"3.0.4-beta1": ["[Improved] Upgrade embedded Git to 2.35.4"],
|
||||
"3.0.3": [
|
||||
"[Added] Add Aptana Studio support - #14669. Thanks @tsvetilian-ty!",
|
||||
"[Fixed] Fix crash when user's locale is unsupported by the spellchecker - #14817. Thanks @tsvetilian-ty!",
|
||||
|
|
Loading…
Reference in a new issue