diff --git a/CHANGELOG.md b/CHANGELOG.md index 76f16b7..7325195 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [4.1.2] - 2017-06-15 +### Fixed +- Fixes [#96](https://github.com/eamodio/vscode-gitlens/issues/96) - External diff command can be unintentionally triggered + ## [4.1.1] - 2017-06-13 ### Added - Adds an `alt` command to the `Toggle File Blame Annotations` command button, which when you hold down `alt` and click it will execute the `Toggle Recent File Changes Annotations` command instead diff --git a/package-lock.json b/package-lock.json index 93db767..9b89024 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "gitlens", - "version": "4.1.0", + "version": "4.1.2", "lockfileVersion": 1, "dependencies": { "@types/copy-paste": { @@ -52,9 +52,16 @@ "dev": true }, "applicationinsights": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.20.1.tgz", - "integrity": "sha1-+5Z+BRkzDAWT7rWvtaB4g2wkML4=" + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.21.0.tgz", + "integrity": "sha1-Ng9JIrg7wHhMb3TfBjZ+QlOJGWM=", + "dependencies": { + "diagnostic-channel-publishers": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.1.3.tgz", + "integrity": "sha1-y9bdEK8e7M1JWsDtZ69fi2hvAKM=" + } + } }, "arr-diff": { "version": "2.0.0", @@ -328,11 +335,6 @@ "resolved": "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-0.1.0.tgz", "integrity": "sha1-emrYrVBmusVE2go3m6F0ujYqV88=" }, - "diagnostic-channel-publishers": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.1.2.tgz", - "integrity": "sha1-M7LDMzkv1+lzMTtO+t+MYAv+ph4=" - }, "diff": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz", @@ -885,9 +887,9 @@ "dev": true }, "iconv-lite": { - "version": "0.4.17", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz", - "integrity": "sha1-T9qjs4rLwsAxsEXQ7c3+HsqxjI0=" + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz", + "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==" }, "ignore": { "version": "3.3.3", diff --git a/package.json b/package.json index c62eca5..c3a6c12 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gitlens", - "version": "4.1.1", + "version": "4.1.2", "author": { "name": "Eric Amodio", "email": "eamodio@gmail.com" @@ -1320,9 +1320,9 @@ "vscode:prepublish": "npm install --no-save && npm run compile" }, "dependencies": { - "applicationinsights": "0.20.1", + "applicationinsights": "0.21.0", "copy-paste": "1.3.0", - "iconv-lite": "0.4.17", + "iconv-lite": "0.4.18", "ignore": "3.3.3", "lodash.debounce": "4.0.8", "lodash.escaperegexp": "4.1.2",