Preps v4.0.0-beta

CHANGELOG.md

@@ -4,7 +4,7 @@ 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.0.0-alpha.2] - 2017-06-05
+## [4.0.0-beta] - 2017-06-06
 ### Added
 - Adds all-new, beautiful, highly customizable and themeable, file blame annotations
   - Can now fully customize the [layout and content](https://github.com/eamodio/vscode-gitlens/blob/develop/README.md#file-blame-annotation-settings), as well as the [theme](https://github.com/eamodio/vscode-gitlens/blob/develop/README.md#theme-settings)
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Changed
 - (BREAKING) Almost all of the GitLens settings have either been renamed, removed, or otherwise changed - see the [README](https://github.com/eamodio/vscode-gitlens/blob/develop/README.md#extension-settings)`
+- Changes the positioning of the Git code lens to try to be at the end of any other code lens on the same line
 - Changes the position of the `Open File in Remote` command (`gitlens.openFileInRemote`) in the context menus - now in the `navigation` group
 - Changes the `Toggle Git Code Lens` command (`gitlens.toggleCodeLens`) to always toggle the Git code lens on and off
 
@@ -32,6 +33,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Removes `Toggle Blame Annotations` command (`gitlens.toggleBlame`) - replaced by the `Toggle File Blame Annotations` command (`gitlens.toggleFileBlame`)
 - Removes `Show Blame Annotations` command (`gitlens.showBlame`) - replaced by the `Show File Blame Annotations` command (`gitlens.showFileBlame`)
 
+### Fixed
+- Fixes [#81](https://github.com/eamodio/vscode-gitlens/issues/81) - Current line annotation feels too sticky
+
 ## [3.6.0] - 2017-06-02
 ### Added
 - Adds diff information (the line's previous version) into the active line hover

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "gitlens",
-    "version": "4.0.0-alpha.2",
+    "version": "4.0.0-beta",
     "lockfileVersion": 1,
     "dependencies": {
         "@types/applicationinsights": {
@@ -28,9 +28,9 @@
             "dev": true
         },
         "@types/node": {
-            "version": "7.0.27",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.27.tgz",
-            "integrity": "sha512-2QMiuVOEye2yKmMwE1V96C9HSShmT0WSm6dv2WjacvePEjQNNJGAerTO5hdYhj5lpdK5MW+FVxmyzDhr4omIdw==",
+            "version": "7.0.28",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.28.tgz",
+            "integrity": "sha512-9rLhvgupMpC7Yh24yB8zj+4L6SZ9BYUwqknEC8+R7gqCg3KL65UHg7yu9X6J8mSmmtVr1Hbey564yZ3C9nXqtQ==",
             "dev": true
         },
         "@types/tmp": {
@@ -1784,9 +1784,9 @@
             "dev": true
         },
         "tslint": {
-            "version": "5.4.2",
-            "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.4.2.tgz",
-            "integrity": "sha1-YJtmQMwEJPSjlamt9ow3VWPFScc=",
+            "version": "5.4.3",
+            "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.4.3.tgz",
+            "integrity": "sha1-dhyEArgONHt3M6BDkKdXslNYBGc=",
             "dev": true
         },
         "tsutils": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitlens",
-    "version": "4.0.0-alpha.2",
+    "version": "4.0.0-beta",
     "author": {
         "name": "Eric Amodio",
         "email": "eamodio@gmail.com"
@@ -1234,7 +1234,7 @@
         "postinstall": "node ./node_modules/vscode/bin/install",
         "pub": "git clean -xdf && vsce publish",
         "reset": "git clean -xdf && npm install",
-        "vscode:prepublish": "npm install && npm run compile"
+        "vscode:prepublish": "npm install --no-save && npm run compile"
     },
     "dependencies": {
         "applicationinsights": "0.20.1",
@@ -1257,7 +1257,7 @@
         "@types/node": "7.0.28",
         "@types/tmp": "0.0.33",
         "mocha": "3.4.2",
-        "tslint": "5.4.2",
+        "tslint": "5.4.3",
         "typescript": "2.3.4",
         "vscode": "1.1.0"
     }