Preps v8.2.0

CHANGELOG.md

@@ -4,23 +4,43 @@ 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/).
 
-## [8.2.0-beta] - 2018-03-26
+## [8.2.0] - 2018-03-31
 ### Added
-- Adds new *GitLens History* explorer to explore the history of the current file — same as the history view in the *GitLens* explorer when undocked
+- Adds new stand-alone *GitLens History* explorer to visualize the history of the current file — undocked version of the *GitLens* explorer history view
 
   ![GitLens History explorer](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/ss-gitlens-history-explorer.png)
 
-- Adds rich tooltip details to the *GitLens* explorer and *GitLens Results* view
-  - Adds richer working tree and upstream status information to branches in the *GitLens* explorer
+- Adds richer tooltips to the *GitLens* explorer and *GitLens Results* view, and richer working tree and upstream status to the *GitLens* explorer
+
+  ![Rich tooltips](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-rich-tooltips.png)
+
 - Adds an indicator to the *GitLens* explorer's branch history to mark the synchronization point between the local and remote branch (if available)
-- Adds a one-time notification on startup if the `alt-based` keyboard shortcuts are in use, with options to easily switch to another set
+
+  ![Branch upstream indicator](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-branch-upstream-indicator.png)
+
 - Adds ability to easily switch between relative and absolute dates via the `gitlens.defaultDateStyle` settings — closes [#312](https://github.com/eamodio/vscode-gitlens/issues/312)
   - Adds `${agoOrDate}` and `${authorAgoOrDate}` tokens to `gitlens.blame.format`, `gitlens.currentLine.format`, `gitlens.explorers.commitFormat`, `gitlens.explorers.stashFormat`, and `gitlens.statusBar.format` settings which will honor the `gitlens.defaultDateStyle` setting
-- Adds `gitlens.currentLine.scrollable` setting to specify whether the current line blame annotation can be scrolled into view when it is outside the viewport — closes [#149](https://github.com/eamodio/vscode-gitlens/issues/149), [#290](https://github.com/eamodio/vscode-gitlens/issues/290), [#265](https://github.com/eamodio/vscode-gitlens/issues/265)
+
+  ![General settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-general-settings.png)
+
+- Adds annotation format settings (`gitlens.*.format`) to the interactive settings editor
+
+  ![Annotation format settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-annotation-format.png)
+
+- Adds new `gitlens.currentLine.scrollable` setting to specify whether the current line blame annotation can be scrolled into view when it is outside the viewport — closes [#149](https://github.com/eamodio/vscode-gitlens/issues/149), [#290](https://github.com/eamodio/vscode-gitlens/issues/290), [#265](https://github.com/eamodio/vscode-gitlens/issues/265)
+
+  ![Allow scrolling to annotation setting](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-current-line-scrollable.png)
+
+- Adds `gitlens.statusBar.reduceFlicker` setting to the interactive settings editor
+
+  ![Reduce status bar flashing setting](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-status-bar-reduce-flashing.png)
+
+- Adds a one-time notification on startup if the `alt-based` keyboard shortcuts are in use, with options to easily switch to another set
 - Adds *Copy Commit ID to Clipboard* (`gitlens.copyShaToClipboard`) command to changed file nodes in the *GitLens* explorer and *GitLens Results* view
 - Adds *Copy Commit Message to Clipboard* (`gitlens.copyMessageToClipboard`) command to changed file nodes in the *GitLens* explorer and *GitLens Results* view
 
 ### Changed
+- Moves *Keyboard Settings* to the *General* section of the interactive settings editor
 - Renames *Compare with Index (HEAD)* (`gitlens.explorers.compareWithHead`) command to *Compare with HEAD* — closes [#309](https://github.com/eamodio/vscode-gitlens/issues/309)
 - Renames *Compare Index (HEAD) with Branch or Tag...* (`gitlens.diffHeadWithBranch`) command to *Compare HEAD with Branch or Tag...* — closes [#309](https://github.com/eamodio/vscode-gitlens/issues/309)
 

README.md

@@ -14,7 +14,7 @@
 
 # What's new in GitLens 8
 ## 8.2 — April 2018
-- Adds new *GitLens History* explorer to explore the history of the current file — same as the history view in the *GitLens* explorer when undocked
+- Adds new stand-alone *GitLens History* explorer to visualize the history of the current file — undocked version of the *GitLens* explorer history view
 - Adds richer tooltips to the *GitLens* explorer and *GitLens Results* view, and richer working tree and upstream status to the *GitLens* explorer
 - Adds an indicator to the *GitLens* explorer's branch history to mark the synchronization point between the local and remote branch (if available)
 - Adds ability to easily switch between relative and absolute dates via the `gitlens.defaultDateStyle` settings — closes [#312](https://github.com/eamodio/vscode-gitlens/issues/312)
@@ -197,7 +197,7 @@ The history view provides the revision history of the current file, which has th
   <img src="https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/ss-gitlens-history-explorer.png" alt="GitLens History Explorer" />
 </p>
 
-A [customizable](#gitlens-history-explorer-settings "Jump to the GitLens History Explorer settings") explorer to explore the history of the current file. This is same as the history view in the *GitLens* Explorer when undocked
+A [customizable](#gitlens-history-explorer-settings "Jump to the GitLens History Explorer settings") stand-alone explorer to visualize the history of the current file &mdash; undocked version of the *GitLens* Explorer history view
 - Automatically updates to track the current editor
 - A context menu provides *Open File*, *Open File in Remote* (if available), and *Refresh* commands
 - An inline toolbar provides an *Open File* command

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "gitlens",
-    "version": "8.2.0-beta",
+    "version": "8.2.0",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -17,9 +17,9 @@
             "dev": true
         },
         "@types/node": {
-            "version": "9.6.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.0.tgz",
-            "integrity": "sha512-h3YZbOq2+ZoDFI1z8Zx0Ck/xRWkOESVaLdgLdd/c25mMQ1Y2CAkILu9ny5A15S5f32gGcQdaUIZ2jzYr8D7IFg==",
+            "version": "9.6.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.1.tgz",
+            "integrity": "sha512-xwlHq5DXQFRpe+u6hmmNkzYk/3oxxqDp71a/AJMupOQYmxyaBetqrVMqdNlSQfbg7XTJYD8vARjf3Op06OzdtQ==",
             "dev": true
         },
         "@types/tmp": {
@@ -9302,9 +9302,9 @@
             }
         },
         "webpack": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.3.0.tgz",
-            "integrity": "sha512-oFbYLpxz8IV44Z5o2uVhvzsdw9J8x/l7Ry9EGvckkx6PFBZo5wRvd2J4nPP9oGhkl2WtNXoU4N7LM5Pjk1MAiA==",
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.4.1.tgz",
+            "integrity": "sha512-iLUJcsEAjaPKWbB32ADr29Pg9fPUVfFEMPK4VXyZGftzhSEFg2BLjHLoBYZ14wdTEA8xqG/hjpuX8qOmabRYvw==",
             "dev": true,
             "requires": {
                 "acorn": "5.5.3",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitlens",
-    "version": "8.2.0-beta",
+    "version": "8.2.0",
     "author": {
         "name": "Eric Amodio",
         "email": "eamodio@gmail.com"
@@ -3049,7 +3049,7 @@
     },
     "devDependencies": {
         "@types/copy-paste": "1.1.30",
-        "@types/node": "9.6.0",
+        "@types/node": "9.6.1",
         "@types/tmp": "0.0.33",
         "husky": "0.14.3",
         "ts-loader": "4.1.0",
@@ -3058,7 +3058,7 @@
         "uglify-es": "3.3.9",
         "uglifyjs-webpack-plugin": "1.2.4",
         "vscode": "1.1.14",
-        "webpack": "4.3.0",
+        "webpack": "4.4.1",
         "webpack-cli": "2.0.13",
         "webpack-node-externals": "1.6.0"
     }

src/ui/package-lock.json

@@ -5,9 +5,9 @@
     "requires": true,
     "dependencies": {
         "@types/node": {
-            "version": "9.6.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.0.tgz",
-            "integrity": "sha512-h3YZbOq2+ZoDFI1z8Zx0Ck/xRWkOESVaLdgLdd/c25mMQ1Y2CAkILu9ny5A15S5f32gGcQdaUIZ2jzYr8D7IFg==",
+            "version": "9.6.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.1.tgz",
+            "integrity": "sha512-xwlHq5DXQFRpe+u6hmmNkzYk/3oxxqDp71a/AJMupOQYmxyaBetqrVMqdNlSQfbg7XTJYD8vARjf3Op06OzdtQ==",
             "dev": true
         },
         "@types/tapable": {
@@ -17,9 +17,9 @@
             "dev": true
         },
         "@types/uglify-js": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.0.tgz",
-            "integrity": "sha512-4I5d8+t+HPvPjya4b0n92bpvszq07Kql0crGW3Vso+Ii2DdLjwCBljv1qaXkIMc62z8IPLGd7lA/b3p5DO6bog==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.1.tgz",
+            "integrity": "sha512-eWwNO88HxJonNKyxZ3dR62yle3N+aBPIsjTrPtoMcldLXGeIKAIlewNIWT4cxjZ4gy3YdBobkaKSv74HJXSzRg==",
             "dev": true,
             "requires": {
                 "source-map": "0.6.1"
@@ -31,9 +31,9 @@
             "integrity": "sha512-NoGVTCumOsyFfuy3934f3ktiJi+wcXHJFxT47tby3iCpuo6M/WjFA9VqT5bYO+FE46i3R0N00RpJX75HxHKDaQ==",
             "dev": true,
             "requires": {
-                "@types/node": "9.6.0",
+                "@types/node": "9.6.1",
                 "@types/tapable": "1.0.1",
-                "@types/uglify-js": "3.0.0",
+                "@types/uglify-js": "3.0.1",
                 "source-map": "0.6.1"
             }
         },
@@ -5181,9 +5181,9 @@
             }
         },
         "imagemin-webpack-plugin": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/imagemin-webpack-plugin/-/imagemin-webpack-plugin-2.1.0.tgz",
-            "integrity": "sha512-5iK1ajaKG4Era3dr7MG1lwFgpp+bLKcEaNlgvRENQC6fIxUctRVM9V7N5ctFf/cr3zlRWWihW6QywIRQJvzDPQ==",
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/imagemin-webpack-plugin/-/imagemin-webpack-plugin-2.1.1.tgz",
+            "integrity": "sha512-zOsR2vR8zxWpjMQ8SgS7k/M6+mpcKRRW/N9rdMzIQ6XhXKwSFX91L+d1hwU/IU3AV+0lpZcphO4DGZEInrAhAg==",
             "dev": true,
             "requires": {
                 "async-throttle": "1.1.0",
@@ -6754,7 +6754,7 @@
                 "readable-stream": "2.3.5",
                 "stream-browserify": "2.0.1",
                 "stream-http": "2.8.1",
-                "string_decoder": "1.1.0",
+                "string_decoder": "1.1.1",
                 "timers-browserify": "2.0.6",
                 "tty-browserify": "0.0.0",
                 "url": "0.11.0",
@@ -6818,9 +6818,9 @@
                     }
                 },
                 "string_decoder": {
-                    "version": "1.1.0",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.0.tgz",
-                    "integrity": "sha512-8zQpRF6juocE69ae7CSPmYEGJe4VCXwP6S6dxUWI7i53Gwv54/ec41fiUA+X7BPGGv7fRSQJjBQVa0gomGaOgg==",
+                    "version": "1.1.1",
+                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
                     "dev": true,
                     "requires": {
                         "safe-buffer": "5.1.1"
@@ -10587,7 +10587,7 @@
                 "resolve": "1.6.0",
                 "semver": "5.5.0",
                 "tslib": "1.9.0",
-                "tsutils": "2.24.0"
+                "tsutils": "2.25.0"
             },
             "dependencies": {
                 "ansi-styles": {
@@ -10628,9 +10628,9 @@
             }
         },
         "tsutils": {
-            "version": "2.24.0",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.24.0.tgz",
-            "integrity": "sha512-rOIkvoe17acR3r96IPnqwa1+Z7zx9AroEtEKl20IeExXtoWptqG/zb806cYOvdbQGcxh1eOaZQNruOQ716Edig==",
+            "version": "2.25.0",
+            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.25.0.tgz",
+            "integrity": "sha512-SPgUlOAUAe6fCyPi0QR4U0jRuDsHHKvzIR6/hHd0YR0bb8MzeLJgCagkPSmZeJjWImnpJ0xq6XHa9goTvMBBCQ==",
             "dev": true,
             "requires": {
                 "tslib": "1.9.0"
@@ -11190,9 +11190,9 @@
             }
         },
         "webpack": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.3.0.tgz",
-            "integrity": "sha512-oFbYLpxz8IV44Z5o2uVhvzsdw9J8x/l7Ry9EGvckkx6PFBZo5wRvd2J4nPP9oGhkl2WtNXoU4N7LM5Pjk1MAiA==",
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.4.1.tgz",
+            "integrity": "sha512-iLUJcsEAjaPKWbB32ADr29Pg9fPUVfFEMPK4VXyZGftzhSEFg2BLjHLoBYZ14wdTEA8xqG/hjpuX8qOmabRYvw==",
             "dev": true,
             "requires": {
                 "acorn": "5.5.3",

src/ui/package.json

@@ -24,13 +24,13 @@
         "build-dev": "webpack"
     },
     "devDependencies": {
-        "@types/node": "9.6.0",
+        "@types/node": "9.6.1",
         "@types/webpack": "4.1.3",
         "css-loader": "0.28.11",
         "extract-text-webpack-plugin": "4.0.0-beta.0",
         "html-webpack-inline-source-plugin": "0.0.10",
         "html-webpack-plugin": "3.1.0",
-        "imagemin-webpack-plugin": "2.1.0",
+        "imagemin-webpack-plugin": "2.1.1",
         "node-sass": "4.8.3",
         "sass-loader": "6.0.7",
         "style-loader": "0.20.3",
@@ -38,6 +38,6 @@
         "ts-loader": "4.1.0",
         "typescript": "2.8.1",
         "uglifyjs-webpack-plugin": "1.2.4",
-        "webpack": "4.3.0"
+        "webpack": "4.4.1"
     }
 }

src/ui/settings/index.html

@@ -207,7 +207,7 @@
                                     <i class="icon icon__info"></i>
                                 </a>
                             </h2>
-                            <p class="section__title-hint">Adds a GitLens History explorer to explore the history of the current file</p>
+                            <p class="section__title-hint">Adds a GitLens History explorer to visualize the history of the current file</p>
                         </div>
                         <div class="section__settings">
                             <div class="settings-group">
@@ -215,7 +215,7 @@
                                     <input class="setting" id="historyExplorer.enabled" name="historyExplorer.enabled" type="checkbox"/>
                                     <label for="historyExplorer.enabled">Show the GitLens History explorer</label>
                                 </div>
-                                <p class="setting__hint hidden" data-visibility="gitExplorer.enabled &amp; historyExplorer.enabled =false">The current file history will be shown docked within the GitLens explorer</p>
+                                <p class="setting__hint hidden" data-visibility="gitExplorer.enabled &amp; historyExplorer.enabled =false">The current file history will be shown (docked) in the GitLens explorer</p>
 
                                 <div class="settings-group__setting nowrap ml-2" data-enablement="historyExplorer.enabled" disabled>
                                     <input class="setting" id="historyExplorer.avatars" name="explorers.avatars" type="checkbox" disabled/>

src/ui/welcome/index.html

@@ -46,32 +46,46 @@
                             <div class="changelog__details"></div>
                         </li>
                         <li><span class="changelog__badge changelog__badge--added">NEW</span>
-                            Adds new <i>GitLens History</i> explorer to explore the history of the current file &mdash; same as the history view in the <i>GitLens</i> explorer when undocked
+                            Adds new stand-alone <i>GitLens History</i> explorer to visualize the history of the current file &mdash; undocked version of the <i>GitLens</i> explorer history view
                             <div class="changelog__details">
                                 <img class="changelog__image" src="{{root}}/images/cl-history-explorer.png" alt="GitLens History explorer"/>
                             </div>
                         </li>
                         <li><span class="changelog__badge changelog__badge--added">NEW</span>
-                            Adds rich tooltip details to the <i>GitLens</i> explorer and <i>GitLens Results</i> view
+                            Adds richer tooltips to the <i>GitLens</i> explorer and <i>GitLens Results</i> view, and richer working tree and upstream status to the <i>GitLens</i> explorer
                             <div class="changelog__details">
-                            <!-- <img class="changelog__image" src="{{root}}/images/cl-issue-linking.png" alt="Issue linking in commit messages"/> -->
+                                <img class="changelog__image" src="{{root}}/images/cl-rich-tooltips.png" alt="Richer tooltips and working tree and upstream status"/>
                             </div>
                         </li>
                         <li><span class="changelog__badge changelog__badge--added">NEW</span>
-                            Adds richer working tree and upstream status information to branches in the <i>GitLens</i> explorer
-                            <div class="changelog__details"></div>
-                        </li>
-                        <li><span class="changelog__badge changelog__badge--added">NEW</span>
                             Adds an indicator to the <i>GitLens</i> explorer's branch history to mark the synchronization point between the local and remote branch (if available)
-                            <div class="changelog__details"></div>
+                            <div class="changelog__details">
+                                <img class="changelog__image" src="{{root}}/images/cl-branch-upstream-indicator.png" alt="Branch upstream indicator"/>
+                            </div>
                         </li>
                         <li><span class="changelog__badge changelog__badge--added">NEW</span>
                             Adds ability to easily switch between relative and absolute dates via the <code>gitlens.defaultDateStyle</code> settings &mdash; closes <a title="Open Issue #312" href="https://github.com/eamodio/vscode-gitlens/issues/312">#312</a>
-                            <div class="changelog__details"></div>
+                            <div class="changelog__details">
+                                <img class="changelog__image" src="{{root}}/images/cl-general-settings.png" alt="General settings"/>
+                            </div>
                         </li>
                         <li><span class="changelog__badge changelog__badge--added">NEW</span>
-                            Adds <code>gitlens.currentLine.scrollable</code> setting to specify whether the current line blame annotation can be scrolled into view when it is outside the viewport &mdash; closes <a title="Open Issue #149" href="https://github.com/eamodio/vscode-gitlens/issues/149">#149</a>, <a title="Open Issue #290" href="https://github.com/eamodio/vscode-gitlens/issues/290">#290</a>, <a title="Open Issue #265" href="https://github.com/eamodio/vscode-gitlens/issues/265">#265</a>
-                            <div class="changelog__details"></div>
+                            Adds annotation format settings (<code>gitlens.*.format</code>) to the interactive settings editor
+                            <div class="changelog__details">
+                                <img class="changelog__image" src="{{root}}/images/cl-annotation-format.png" alt="Annotation format settings"/>
+                            </div>
+                        </li>
+                        <li><span class="changelog__badge changelog__badge--added">NEW</span>
+                            Adds new <code>gitlens.currentLine.scrollable</code> setting to specify whether the current line blame annotation can be scrolled into view when it is outside the viewport &mdash; closes <a title="Open Issue #149" href="https://github.com/eamodio/vscode-gitlens/issues/149">#149</a>, <a title="Open Issue #290" href="https://github.com/eamodio/vscode-gitlens/issues/290">#290</a>, <a title="Open Issue #265" href="https://github.com/eamodio/vscode-gitlens/issues/265">#265</a>
+                            <div class="changelog__details">
+                                <img class="changelog__image" src="{{root}}/images/cl-current-line-scrollable.png" alt="Allow scrolling to annotation setting"/>
+                            </div>
+                        </li>
+                        <li><span class="changelog__badge changelog__badge--added">NEW</span>
+                            Adds <code>gitlens.statusBar.reduceFlicker</code> setting to the interactive settings editor
+                            <div class="changelog__details">
+                                <img class="changelog__image" src="{{root}}/images/cl-status-bar-reduce-flashing.png" alt="Reduce status bar flashing setting"/>
+                            </div>
                         </li>
                         <li><span class="changelog__badge changelog__badge--fixed">FIXED</span>
                             Fixes <a title="Open Issue #314" href="https://github.com/eamodio/vscode-gitlens/issues/314">#314</a> &mdash; Toggle line annotation doesn't work properly