From 1503c4255bb3d8a79ed4327869feaa89516feb14 Mon Sep 17 00:00:00 2001
From: Michelle Tilley <binarymuse@github.com>
Date: Tue, 22 Aug 2017 11:18:22 -0700
Subject: [PATCH 1/4] Move "Undo Discard" button to bottom of unstaged changes
 list

---
 lib/views/staging-view.js | 2 +-
 styles/staging-view.less  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/views/staging-view.js b/lib/views/staging-view.js
index 9dc12fb42c..507fe21d8b 100644
--- a/lib/views/staging-view.js
+++ b/lib/views/staging-view.js
@@ -513,7 +513,6 @@ export default class StagingView {
             <span className="github-StagingView-title">Unstaged Changes</span>
             {this.props.unstagedChanges.length ? this.renderStageAllButton() : null}
           </header>
-          {this.props.hasUndoHistory ? this.renderUndoButton() : null}
 
           <div ref="unstagedChanges" className="github-StagingView-list github-FilePatchListView">
             {
@@ -531,6 +530,7 @@ export default class StagingView {
               ))
             }
           </div>
+          {this.props.hasUndoHistory ? this.renderUndoButton() : null}
           {this.renderTruncatedMessage(this.props.unstagedChanges)}
         </div>
         { this.renderMergeConflicts() }
diff --git a/styles/staging-view.less b/styles/staging-view.less
index 4452f038bc..d9c16ed54d 100644
--- a/styles/staging-view.less
+++ b/styles/staging-view.less
@@ -59,7 +59,7 @@
 
     &--fullWidth {
       border-left: none;
-      border-bottom: 1px solid @panel-heading-border-color;
+      border-top: 1px solid @panel-heading-border-color;
     }
   }
 
@@ -86,6 +86,7 @@
 
 .github-StagingView-group-truncatedMsg {
   padding: @component-padding / 2 @component-padding;
+  border-top: 1px solid @panel-heading-border-color;
 }
 
 .github-StagingView-group.is-focused .is-selected {

From 5863c1962688cec5ec3a35f2b417b2b479b0f46f Mon Sep 17 00:00:00 2001
From: Michelle Tilley <binarymuse@github.com>
Date: Wed, 23 Aug 2017 14:04:02 -0700
Subject: [PATCH 2/4] Add minimatch dependency

---
 package-lock.json | 211 ++++++++++++++++++++++++----------------------
 package.json      |   1 +
 2 files changed, 109 insertions(+), 103 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2aac4f9cfd..65c89c2275 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "github",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -172,6 +172,7 @@
     "ajv": {
       "version": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
       "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+      "dev": true,
       "requires": {
         "co": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
         "json-stable-stringify": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"
@@ -248,11 +249,13 @@
     },
     "asn1": {
       "version": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "dev": true
     },
     "assert-plus": {
       "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+      "dev": true
     },
     "assertion-error": {
       "version": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
@@ -275,7 +278,9 @@
     },
     "asynckit": {
       "version": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true,
+      "optional": true
     },
     "atob": {
       "version": "2.0.3",
@@ -313,11 +318,13 @@
     },
     "aws-sign2": {
       "version": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "dev": true
     },
     "aws4": {
       "version": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+      "dev": true
     },
     "babel-code-frame": {
       "version": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
@@ -347,7 +354,7 @@
         "debug": "2.6.8",
         "json5": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
         "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-        "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+        "minimatch": "3.0.4",
         "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
         "private": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
         "slash": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
@@ -809,6 +816,7 @@
     "bcrypt-pbkdf": {
       "version": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
       "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "dev": true,
       "optional": true,
       "requires": {
         "tweetnacl": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
@@ -842,13 +850,6 @@
         }
       }
     },
-    "block-stream": {
-      "version": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "requires": {
-        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-      }
-    },
     "boolbase": {
       "version": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
@@ -857,6 +858,7 @@
     "boom": {
       "version": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "dev": true,
       "requires": {
         "hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
       }
@@ -867,7 +869,7 @@
       "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
       "requires": {
         "balanced-match": "1.0.0",
-        "concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+        "concat-map": "0.0.1"
       }
     },
     "braces": {
@@ -957,7 +959,9 @@
     },
     "caseless": {
       "version": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true,
+      "optional": true
     },
     "chai": {
       "version": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
@@ -985,13 +989,6 @@
         "supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
       }
     },
-    "checksum": {
-      "version": "https://registry.npmjs.org/checksum/-/checksum-0.1.1.tgz",
-      "integrity": "sha1-3GUn1MkL6FYNvR7Uzs8yl9Uo6ek=",
-      "requires": {
-        "optimist": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"
-      }
-    },
     "cheerio": {
       "version": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
       "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=",
@@ -1087,7 +1084,8 @@
     },
     "co": {
       "version": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
     },
     "code-point-at": {
       "version": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -1106,6 +1104,7 @@
     "combined-stream": {
       "version": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
       "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "dev": true,
       "requires": {
         "delayed-stream": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
       }
@@ -1128,7 +1127,8 @@
       "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
     },
     "concat-map": {
-      "version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
@@ -1166,7 +1166,8 @@
     },
     "core-util-is": {
       "version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
     },
     "create-react-class": {
       "version": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.0.tgz",
@@ -1201,6 +1202,7 @@
     "cryptiles": {
       "version": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
       "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "dev": true,
       "requires": {
         "boom": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
       }
@@ -1232,13 +1234,15 @@
     "dashdash": {
       "version": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
       "requires": {
         "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
       },
       "dependencies": {
         "assert-plus": {
           "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
         }
       }
     },
@@ -1318,7 +1322,8 @@
     },
     "delayed-stream": {
       "version": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
     },
     "depd": {
       "version": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
@@ -1388,22 +1393,10 @@
         "domelementtype": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
       }
     },
-    "dugite": {
-      "version": "https://registry.npmjs.org/dugite/-/dugite-1.36.0.tgz",
-      "integrity": "sha1-LRlCht1TLurZOCtlOG0Xc5RqIB4=",
-      "requires": {
-        "checksum": "https://registry.npmjs.org/checksum/-/checksum-0.1.1.tgz",
-        "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-        "os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-        "progress": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-        "request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-        "rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-        "tar": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
-      }
-    },
     "ecc-jsbn": {
       "version": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
       "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "dev": true,
       "optional": true,
       "requires": {
         "jsbn": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
@@ -1670,7 +1663,7 @@
         "eslint-module-utils": "2.1.1",
         "has": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
         "lodash.cond": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
-        "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+        "minimatch": "3.0.4",
         "read-pkg-up": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"
       },
       "dependencies": {
@@ -1723,7 +1716,7 @@
       "dev": true,
       "requires": {
         "ignore": "3.3.3",
-        "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+        "minimatch": "3.0.4",
         "resolve": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
         "semver": "5.3.0"
       },
@@ -1904,7 +1897,8 @@
     },
     "extend": {
       "version": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+      "dev": true
     },
     "extend-shallow": {
       "version": "2.0.1",
@@ -1974,7 +1968,8 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
     },
     "fast-glob": {
       "version": "1.0.1",
@@ -2081,11 +2076,14 @@
     },
     "forever-agent": {
       "version": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
     },
     "form-data": {
       "version": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
       "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "dev": true,
+      "optional": true,
       "requires": {
         "asynckit": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
         "combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
@@ -2120,16 +2118,6 @@
       "version": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "fstream": {
-      "version": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-      "requires": {
-        "graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-        "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-        "rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"
-      }
-    },
     "function-bind": {
       "version": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
       "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E=",
@@ -2172,13 +2160,15 @@
     "getpass": {
       "version": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
       "requires": {
         "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
       },
       "dependencies": {
         "assert-plus": {
           "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
         }
       }
     },
@@ -2190,7 +2180,7 @@
         "fs.realpath": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
         "inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
         "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-        "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+        "minimatch": "3.0.4",
         "once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
         "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
       }
@@ -2275,11 +2265,15 @@
     },
     "har-schema": {
       "version": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+      "dev": true,
+      "optional": true
     },
     "har-validator": {
       "version": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
       "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "dev": true,
+      "optional": true,
       "requires": {
         "ajv": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
         "har-schema": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"
@@ -2333,6 +2327,7 @@
     "hawk": {
       "version": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
       "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "dev": true,
       "requires": {
         "boom": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
         "cryptiles": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
@@ -2350,7 +2345,8 @@
     },
     "hoek": {
       "version": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "dev": true
     },
     "hoist-non-react-statics": {
       "version": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz",
@@ -2384,6 +2380,7 @@
     "http-signature": {
       "version": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
       "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "dev": true,
       "requires": {
         "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
         "jsprim": "1.4.1",
@@ -2691,7 +2688,8 @@
     },
     "is-typedarray": {
       "version": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -2722,7 +2720,8 @@
     },
     "isstream": {
       "version": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
     },
     "iterall": {
       "version": "1.1.1",
@@ -2771,6 +2770,7 @@
     "jsbn": {
       "version": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true,
       "optional": true
     },
     "jsesc": {
@@ -2779,18 +2779,21 @@
     },
     "json-schema": {
       "version": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
     },
     "json-stable-stringify": {
       "version": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
       "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "dev": true,
       "requires": {
         "jsonify": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
       }
     },
     "json-stringify-safe": {
       "version": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
     },
     "json3": {
       "version": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
@@ -2810,7 +2813,8 @@
     },
     "jsonify": {
       "version": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true
     },
     "jsonpointer": {
       "version": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
@@ -2821,6 +2825,7 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -2831,7 +2836,8 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
         }
       }
     },
@@ -3139,12 +3145,14 @@
     "mime-db": {
       "version": "1.29.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
-      "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg="
+      "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg=",
+      "dev": true
     },
     "mime-types": {
       "version": "2.1.16",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
       "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=",
+      "dev": true,
       "requires": {
         "mime-db": "1.29.0"
       }
@@ -3158,8 +3166,9 @@
       }
     },
     "minimatch": {
-      "version": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
         "brace-expansion": "1.1.8"
       }
@@ -3221,7 +3230,7 @@
             "fs.realpath": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
             "inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
             "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-            "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+            "minimatch": "3.0.4",
             "once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
             "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
           }
@@ -3499,7 +3508,8 @@
     },
     "oauth-sign": {
       "version": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "dev": true
     },
     "object-assign": {
       "version": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -3640,13 +3650,6 @@
       "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
       "dev": true
     },
-    "optimist": {
-      "version": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-      "requires": {
-        "wordwrap": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
-      }
-    },
     "optionator": {
       "version": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
@@ -3759,7 +3762,9 @@
     },
     "performance-now": {
       "version": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+      "dev": true,
+      "optional": true
     },
     "pify": {
       "version": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -3813,10 +3818,6 @@
       "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
       "dev": true
     },
-    "progress": {
-      "version": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8="
-    },
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
@@ -3854,11 +3855,14 @@
     },
     "punycode": {
       "version": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
     },
     "qs": {
       "version": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
+      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+      "dev": true,
+      "optional": true
     },
     "react": {
       "version": "https://registry.npmjs.org/react/-/react-15.6.1.tgz",
@@ -4031,6 +4035,8 @@
     "request": {
       "version": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
       "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "dev": true,
+      "optional": true,
       "requires": {
         "aws-sign2": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
         "aws4": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
@@ -4206,7 +4212,8 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
+      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
+      "dev": true
     },
     "samsam": {
       "version": "https://registry.npmjs.org/samsam/-/samsam-1.2.1.tgz",
@@ -4403,6 +4410,7 @@
     "sntp": {
       "version": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
       "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "dev": true,
       "requires": {
         "hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
       }
@@ -4473,6 +4481,7 @@
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
       "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "dev": true,
       "requires": {
         "asn1": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
         "assert-plus": "1.0.0",
@@ -4487,7 +4496,8 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
         }
       }
     },
@@ -4550,7 +4560,8 @@
     },
     "stringstream": {
       "version": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+      "dev": true
     },
     "strip-ansi": {
       "version": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -4618,15 +4629,6 @@
         }
       }
     },
-    "tar": {
-      "version": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-      "requires": {
-        "block-stream": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-        "fstream": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-      }
-    },
     "temp": {
       "version": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz",
       "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=",
@@ -4748,6 +4750,7 @@
     "tough-cookie": {
       "version": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
       "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "dev": true,
       "requires": {
         "punycode": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
       }
@@ -4768,6 +4771,8 @@
     "tunnel-agent": {
       "version": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "optional": true,
       "requires": {
         "safe-buffer": "5.1.1"
       }
@@ -4775,6 +4780,7 @@
     "tweetnacl": {
       "version": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true,
       "optional": true
     },
     "type-check": {
@@ -4876,7 +4882,8 @@
     "uuid": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ="
+      "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=",
+      "dev": true
     },
     "validate-npm-package-license": {
       "version": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
@@ -4890,6 +4897,7 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -4899,7 +4907,8 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
         }
       }
     },
@@ -4946,10 +4955,6 @@
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
       "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
     },
-    "wordwrap": {
-      "version": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-    },
     "wrap-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
diff --git a/package.json b/package.json
index 12000f02cb..c65a754080 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "hoist-non-react-statics": "^1.2.0",
     "keytar": "^4.0.3",
     "lodash.memoize": "^4.1.2",
+    "minimatch": "^3.0.4",
     "moment": "^2.17.1",
     "multi-list-selection": "^0.1.1",
     "ncp": "^2.0.0",

From fc8e6875534749a7a5a4496bb6b8bbe326fdc356 Mon Sep 17 00:00:00 2001
From: Michelle Tilley <binarymuse@github.com>
Date: Wed, 23 Aug 2017 14:04:16 -0700
Subject: [PATCH 3/4] WIP (to be reset): mockups of filter panel

---
 lib/views/staging-view.js | 26 ++++++++++++++++++++++++--
 styles/staging-view.less  | 26 ++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/lib/views/staging-view.js b/lib/views/staging-view.js
index 507fe21d8b..ae480c7349 100644
--- a/lib/views/staging-view.js
+++ b/lib/views/staging-view.js
@@ -349,7 +349,10 @@ export default class StagingView {
 
   writeAfterUpdate() {
     const headItem = this.selection.getHeadItem();
-    if (headItem) { this.listElementsByItem.get(headItem).scrollIntoViewIfNeeded(); }
+    if (headItem) {
+      const element = this.listElementsByItem.get(headItem);
+      element && element.scrollIntoViewIfNeeded();
+    }
   }
 
   // Directly modify the selection to include only the item identified by the file path and stagingStatus tuple.
@@ -500,6 +503,7 @@ export default class StagingView {
   }
 
   render() {
+    window.t = this;
     const selectedItems = this.selection.getSelectedItems();
 
     return (
@@ -511,12 +515,28 @@ export default class StagingView {
           <header className="github-StagingView-header">
             <span className="icon icon-list-unordered" />
             <span className="github-StagingView-title">Unstaged Changes</span>
+            <span className="icon icon-settings" />
             {this.props.unstagedChanges.length ? this.renderStageAllButton() : null}
           </header>
 
+          <div className="github-StagingView-filters native-key-bindings">
+            <div>
+              <input className="input-text" type="text" placeholder="Filter file list (globs accepted)" value="spec/token.*coffee" />
+            </div>
+            <div>
+              <label className="input-label">
+                <input className="input-checkbox" type="checkbox" checked /> Untracked Files
+              </label>
+              <span className="github-StagingView-filters-hiding-count">
+                <span className="icon icon-eye" />
+                3 / 457
+              </span>
+            </div>
+          </div>
+
           <div ref="unstagedChanges" className="github-StagingView-list github-FilePatchListView">
             {
-              this.truncatedLists.unstagedChanges.map(filePatch => (
+              this.truncatedLists.unstagedChanges.filter(f => f.filePath.match(/^spec\/token.*coffee$/)).map(filePatch => (
                 <FilePatchListItemView
                   key={filePatch.filePath}
                   registerItemElement={this.registerItemElement}
@@ -529,6 +549,7 @@ export default class StagingView {
                 />
               ))
             }
+            <button className="github-StagingView-headerButton github-StagingView-headerButton--fullWidth github-StagingView-moreFilesButton icon icon-eye">454 more files hidden by filters</button>
           </div>
           {this.props.hasUndoHistory ? this.renderUndoButton() : null}
           {this.renderTruncatedMessage(this.props.unstagedChanges)}
@@ -545,6 +566,7 @@ export default class StagingView {
                   : ''
               }
             </span>
+            <span className="icon icon-settings" />
             { this.props.stagedChanges.length ? this.renderUnstageAllButton() : null }
           </header>
           <div ref="stagedChanges" className="github-StagingView-list github-FilePatchListView">
diff --git a/styles/staging-view.less b/styles/staging-view.less
index d9c16ed54d..112c6f4cb3 100644
--- a/styles/staging-view.less
+++ b/styles/staging-view.less
@@ -5,6 +5,23 @@
   display: flex;
   flex-direction: column;
 
+  &-filters {
+    padding: @component-padding @component-padding 0 @component-padding;
+    border-bottom: 1px solid @panel-heading-border-color;
+
+    > div {
+      margin-bottom: @component-padding / 2;
+      display: flex;
+    }
+
+    label {
+      flex: 1;
+    }
+
+    &-hiding-count {
+    }
+  }
+
   &-group {
     flex: 1;
     display: flex;
@@ -43,6 +60,15 @@
     background: none;
     cursor: default;
 
+    &.github-StagingView-moreFilesButton {
+      border-top: none;
+      font-style: italic;
+      color: @text-color-subtle;
+      text-align: center;
+      width: 100%;
+      cursor: pointer;
+    }
+
     &:disabled {
       color: @text-color-subtle;
     }

From c0e16023c0af326766098c62211ab5f066ef04be Mon Sep 17 00:00:00 2001
From: simurai <simulus@gmail.com>
Date: Fri, 25 Aug 2017 14:23:20 +0900
Subject: [PATCH 4/4] Move count to title

---
 lib/views/staging-view.js | 14 +++++++-------
 styles/staging-view.less  | 19 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/lib/views/staging-view.js b/lib/views/staging-view.js
index ae480c7349..7013d81f20 100644
--- a/lib/views/staging-view.js
+++ b/lib/views/staging-view.js
@@ -514,23 +514,22 @@ export default class StagingView {
         <div className={`github-StagingView-group github-UnstagedChanges ${this.getFocusClass('unstaged')}`}>
           <header className="github-StagingView-header">
             <span className="icon icon-list-unordered" />
-            <span className="github-StagingView-title">Unstaged Changes</span>
+            <span className="github-StagingView-title">
+              Unstaged Changes
+              <span className="github-StagingView-title-count">(3/457)</span>
+            </span>
             <span className="icon icon-settings" />
             {this.props.unstagedChanges.length ? this.renderStageAllButton() : null}
           </header>
 
           <div className="github-StagingView-filters native-key-bindings">
-            <div>
+            <div className="github-StagingView-filters-row">
               <input className="input-text" type="text" placeholder="Filter file list (globs accepted)" value="spec/token.*coffee" />
             </div>
-            <div>
+            <div className="github-StagingView-filters-row">
               <label className="input-label">
                 <input className="input-checkbox" type="checkbox" checked /> Untracked Files
               </label>
-              <span className="github-StagingView-filters-hiding-count">
-                <span className="icon icon-eye" />
-                3 / 457
-              </span>
             </div>
           </div>
 
@@ -565,6 +564,7 @@ export default class StagingView {
                   ? ` (amending ${shortenSha(this.props.lastCommit.getSha())})`
                   : ''
               }
+              <span className="github-StagingView-title-count">(58)</span>
             </span>
             <span className="icon icon-settings" />
             { this.props.stagedChanges.length ? this.renderUnstageAllButton() : null }
diff --git a/styles/staging-view.less b/styles/staging-view.less
index 112c6f4cb3..cb2a1035eb 100644
--- a/styles/staging-view.less
+++ b/styles/staging-view.less
@@ -7,18 +7,15 @@
 
   &-filters {
     padding: @component-padding @component-padding 0 @component-padding;
-    border-bottom: 1px solid @panel-heading-border-color;
 
-    > div {
-      margin-bottom: @component-padding / 2;
+    &-row {
+      padding-bottom: @component-padding;
       display: flex;
-    }
-
-    label {
-      flex: 1;
-    }
+      justify-content: space-between;
 
-    &-hiding-count {
+      &:last-child {
+        border-bottom: 1px solid @panel-heading-border-color;
+      }
     }
   }
 
@@ -97,6 +94,10 @@
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+
+    &-count {
+      margin-left: .5em;
+    }
   }
 
   &-list {