Skip to content

Commit

Permalink
Merge pull request desktop#4827 from desktop/bump-dugite-for-schannel…
Browse files Browse the repository at this point in the history
…-fix

Bump dugite and dugite-native for schannel fix on Windows
  • Loading branch information
nerdneha authored May 30, 2018
2 parents 99ad8da + 67b6d52 commit 1ae8d13
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"productName": "GitHub Desktop",
"bundleID": "com.github.GitHubClient",
"companyName": "GitHub, Inc.",
"version": "1.2.1",
"version": "1.2.2-beta1",
"main": "./main.js",
"repository": {
"type": "git",
Expand All @@ -25,7 +25,7 @@
"codemirror-mode-elixir": "1.1.1",
"deep-equal": "^1.0.1",
"dexie": "^2.0.0",
"dugite": "1.65.0",
"dugite": "^1.66.0",
"electron-window-state": "^4.0.2",
"event-kit": "^2.0.0",
"file-uri-to-path": "0.0.2",
Expand Down
6 changes: 3 additions & 3 deletions app/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,9 @@ dom-matches@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/dom-matches/-/dom-matches-2.0.0.tgz#d2728b416a87533980eb089b848d253cf23a758c"

dugite@1.65.0:
version "1.65.0"
resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.65.0.tgz#43636fb9af9afe701a694f17857d38b56184679c"
dugite@^1.66.0:
version "1.66.0"
resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.66.0.tgz#5fdab6683c0b538a79bdbec499e9f3d3ea7210f9"
dependencies:
checksum "^0.1.1"
mkdirp "^0.5.1"
Expand Down
4 changes: 4 additions & 0 deletions changelog.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"releases": {
"1.2.2-beta1": [
"[Fixed] Make cURL/schannel default to using the Windows certificate store - #4817",
"[Fixed] Text selection highlighting in diffs is back - #4818"
],
"1.2.1": [
"[Added] Brackets support for macOS - #4608. Thanks @3raxton!",
"[Added] Pull request number and author are included in fuzzy-find filtering - #4653. Thanks @damaneice!",
Expand Down

0 comments on commit 1ae8d13

Please sign in to comment.