From 418b05abaa3a1884b2fa28daab2cc4ba2df6d7e7 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Fri, 28 Sep 2018 14:30:26 +0200
Subject: [PATCH 001/188] Bootstrapped Diff-Component

---
 scm-ui/package.json                           |  1 +
 scm-ui/src/repos/containers/RepositoryRoot.js | 14 ++++++
 scm-ui/src/repos/containers/ScmDiff.js        | 44 +++++++++++++++++++
 scm-ui/styles/scm.scss                        |  5 +++
 scm-ui/yarn.lock                              | 26 ++++++++++-
 5 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 scm-ui/src/repos/containers/ScmDiff.js

diff --git a/scm-ui/package.json b/scm-ui/package.json
index 50ae39cd29..bf34ddd5fc 100644
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -16,6 +16,7 @@
     "i18next-fetch-backend": "^0.1.0",
     "moment": "^2.22.2",
     "react": "^16.4.2",
+    "react-diff-view": "^1.7.0",
     "react-dom": "^16.4.2",
     "react-i18next": "^7.9.0",
     "react-jss": "^8.6.0",
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index 2816cdb5c5..69efd4a857 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -25,6 +25,7 @@ import Edit from "../containers/Edit";
 
 import type { History } from "history";
 import EditNavLink from "../components/EditNavLink";
+import ScmDiff from "./ScmDiff";
 
 type Props = {
   namespace: string,
@@ -101,6 +102,16 @@ class RepositoryRoot extends React.Component<Props> {
               path={`${url}/edit`}
               component={() => <Edit repository={repository} />}
             />
+            <Route
+              path={`${url}/diff`}
+              component={() => (
+                <ScmDiff
+                  namespace={"scmadmin"}
+                  name={"foo"}
+                  revision={"4c18735d4c3bd89242284ed3eac52592637024b6"}
+                />
+              )}
+            />
           </div>
           <div className="column">
             <Navigation>
@@ -112,6 +123,9 @@ class RepositoryRoot extends React.Component<Props> {
                 <DeleteNavAction repository={repository} delete={this.delete} />
                 <NavLink to="/repos" label={t("repository-root.back-label")} />
               </Section>
+              <Section label="Diff">
+                <NavLink to={`${url}/diff`} label="Diff" />
+              </Section>
             </Navigation>
           </div>
         </div>
diff --git a/scm-ui/src/repos/containers/ScmDiff.js b/scm-ui/src/repos/containers/ScmDiff.js
new file mode 100644
index 0000000000..f8bf218812
--- /dev/null
+++ b/scm-ui/src/repos/containers/ScmDiff.js
@@ -0,0 +1,44 @@
+// @flow
+
+import React from "react";
+import { Diff, Hunk, parseDiff } from "react-diff-view";
+import { apiClient } from "@scm-manager/ui-components";
+
+type Props = {
+  namespace: string,
+  name: string,
+  revision: string
+};
+
+class ScmDiff extends React.Component<Props> {
+  constructor(props: Props) {
+    super(props);
+    this.state = {};
+  }
+
+  componentDidMount() {
+    const { namespace, name, revision } = this.props;
+    const url = `http://localhost:8081/scm/api/rest/v2/repositories/${namespace}/${name}/diff/${revision}`;
+    apiClient
+      .get(url)
+      .then(response => response.text())
+      .then(text => this.setState({ diff: text }))
+      .catch(error => this.setState({ error }));
+  }
+
+  render() {
+    if (!this.state.diff || this.state.diff === "") {
+      return null;
+    }
+    const files = parseDiff(this.state.diff);
+    return (
+      <div>
+        {files.map(({ hunks }, i) => (
+          <Diff key={i} hunks={hunks} viewType="unified" />
+        ))}
+      </div>
+    );
+  }
+}
+
+export default ScmDiff;
diff --git a/scm-ui/styles/scm.scss b/scm-ui/styles/scm.scss
index 43701de5eb..c5559a8697 100644
--- a/scm-ui/styles/scm.scss
+++ b/scm-ui/styles/scm.scss
@@ -1,6 +1,7 @@
 @import "bulma/sass/utilities/initial-variables";
 @import "bulma/sass/utilities/functions";
 
+
 $blue: #33B2E8;
 
 // $footer-background-color
@@ -51,3 +52,7 @@ $blue: #33B2E8;
 @import "@fortawesome/fontawesome-free/scss/fontawesome.scss";
 $fa-font-path: "webfonts";
 @import "@fortawesome/fontawesome-free/scss/solid.scss";
+@import "react-diff-view/src/Change";
+@import "react-diff-view/src/Diff";
+@import "react-diff-view/src/Hunk";
+@import "react-diff-view/src/Widget";
diff --git a/scm-ui/yarn.lock b/scm-ui/yarn.lock
index 26bfec8070..dd761cc3c3 100644
--- a/scm-ui/yarn.lock
+++ b/scm-ui/yarn.lock
@@ -1915,7 +1915,7 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@^2.2.5:
+classnames@^2.2.5, classnames@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
 
@@ -3541,6 +3541,10 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+gitdiff-parser@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/gitdiff-parser/-/gitdiff-parser-0.1.0.tgz#a8f4396e3dd61a8fc274040a2aa02bcf8d952f92"
+
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -5369,6 +5373,10 @@ lodash.escape@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
 
+lodash.findlastindex@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.findlastindex/-/lodash.findlastindex-4.6.0.tgz#b8375ac0f02e9b926375cdf8dc3ea814abf9c6ac"
+
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
@@ -5401,6 +5409,10 @@ lodash.keys@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
+lodash.mapvalues@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
+
 lodash.memoize@~3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
@@ -6716,6 +6728,18 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+react-diff-view@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/react-diff-view/-/react-diff-view-1.7.0.tgz#80c0c13aa1e77ddf71698b75b9aa9ef7cccb02a5"
+  dependencies:
+    classnames "^2.2.6"
+    gitdiff-parser "^0.1.0"
+    leven "^2.1.0"
+    lodash.escape "^4.0.1"
+    lodash.findlastindex "^4.6.0"
+    lodash.mapvalues "^4.6.0"
+    warning "^4.0.1"
+
 react-dom@^16.4.2:
   version "16.4.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.2.tgz#4afed569689f2c561d2b8da0b819669c38a0bda4"

From 0ff050e544b935f065b8e5888b072e852de7442b Mon Sep 17 00:00:00 2001
From: Mohamed Karray <mohamed.karray.sr@gmail.com>
Date: Wed, 10 Oct 2018 17:35:41 +0200
Subject: [PATCH 002/188] fix url and add the postcss-easy-import dependency

---
 scm-ui-components/yarn.lock                   | 3669 +++++++++++++++++
 scm-ui/package.json                           |    2 +
 scm-ui/src/repos/containers/RepositoryRoot.js |   20 +-
 scm-ui/src/repos/containers/ScmDiff.js        |   25 +-
 scm-ui/yarn.lock                              |   59 +-
 5 files changed, 3752 insertions(+), 23 deletions(-)
 create mode 100644 scm-ui-components/yarn.lock

diff --git a/scm-ui-components/yarn.lock b/scm-ui-components/yarn.lock
new file mode 100644
index 0000000000..5a078774d6
--- /dev/null
+++ b/scm-ui-components/yarn.lock
@@ -0,0 +1,3669 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@lerna/add@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.4.1.tgz#d41068317e30f530df48220d256b5e79690b1877"
+  dependencies:
+    "@lerna/bootstrap" "^3.4.1"
+    "@lerna/command" "^3.3.0"
+    "@lerna/filter-options" "^3.3.2"
+    "@lerna/npm-conf" "^3.4.1"
+    "@lerna/validation-error" "^3.0.0"
+    dedent "^0.7.0"
+    npm-package-arg "^6.0.0"
+    p-map "^1.2.0"
+    pacote "^9.1.0"
+    semver "^5.5.0"
+
+"@lerna/batch-packages@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.1.2.tgz#74b5312a01a8916204cbc71237ffbe93144b99df"
+  dependencies:
+    "@lerna/package-graph" "^3.1.2"
+    "@lerna/validation-error" "^3.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/bootstrap@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.4.1.tgz#10635e9b547fb7d685949ac78e0923f73da2f52a"
+  dependencies:
+    "@lerna/batch-packages" "^3.1.2"
+    "@lerna/command" "^3.3.0"
+    "@lerna/filter-options" "^3.3.2"
+    "@lerna/has-npm-version" "^3.3.0"
+    "@lerna/npm-conf" "^3.4.1"
+    "@lerna/npm-install" "^3.3.0"
+    "@lerna/rimraf-dir" "^3.3.0"
+    "@lerna/run-lifecycle" "^3.4.1"
+    "@lerna/run-parallel-batches" "^3.0.0"
+    "@lerna/symlink-binary" "^3.3.0"
+    "@lerna/symlink-dependencies" "^3.3.0"
+    "@lerna/validation-error" "^3.0.0"
+    dedent "^0.7.0"
+    get-port "^3.2.0"
+    multimatch "^2.1.0"
+    npm-package-arg "^6.0.0"
+    npmlog "^4.1.2"
+    p-finally "^1.0.0"
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+    p-waterfall "^1.0.0"
+    read-package-tree "^5.1.6"
+    semver "^5.5.0"
+
+"@lerna/changed@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.4.1.tgz#84a049359a53b8812c3a07a664bd41b1768f5938"
+  dependencies:
+    "@lerna/collect-updates" "^3.3.2"
+    "@lerna/command" "^3.3.0"
+    "@lerna/listable" "^3.0.0"
+    "@lerna/output" "^3.0.0"
+    "@lerna/version" "^3.4.1"
+
+"@lerna/check-working-tree@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.3.0.tgz#2118f301f28ccb530812e5b27a341b1e6b3c84e2"
+  dependencies:
+    "@lerna/describe-ref" "^3.3.0"
+    "@lerna/validation-error" "^3.0.0"
+
+"@lerna/child-process@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.3.0.tgz#71184a763105b6c8ece27f43f166498d90fe680f"
+  dependencies:
+    chalk "^2.3.1"
+    execa "^1.0.0"
+    strong-log-transformer "^2.0.0"
+
+"@lerna/clean@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.3.2.tgz#9a7e8a1e400e580de260fa124945b2939a025069"
+  dependencies:
+    "@lerna/command" "^3.3.0"
+    "@lerna/filter-options" "^3.3.2"
+    "@lerna/prompt" "^3.3.1"
+    "@lerna/rimraf-dir" "^3.3.0"
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+    p-waterfall "^1.0.0"
+
+"@lerna/cli@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-3.2.0.tgz#3ed25bcbc0b8f0878bc6a102ee0296f01476cfdf"
+  dependencies:
+    "@lerna/global-options" "^3.1.3"
+    dedent "^0.7.0"
+    npmlog "^4.1.2"
+    yargs "^12.0.1"
+
+"@lerna/collect-updates@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.3.2.tgz#54df5ce59ca05e8aa04ff8a9299f89cc253a9304"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/describe-ref" "^3.3.0"
+    minimatch "^3.0.4"
+    npmlog "^4.1.2"
+    slash "^1.0.0"
+
+"@lerna/command@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.3.0.tgz#e81c4716a676b02dbe9d3f548d5f45b4ba32c25a"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/package-graph" "^3.1.2"
+    "@lerna/project" "^3.0.0"
+    "@lerna/validation-error" "^3.0.0"
+    "@lerna/write-log-file" "^3.0.0"
+    dedent "^0.7.0"
+    execa "^1.0.0"
+    is-ci "^1.0.10"
+    lodash "^4.17.5"
+    npmlog "^4.1.2"
+
+"@lerna/conventional-commits@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.4.1.tgz#0b47f9fc0c4a10951883e949d939188da1b527bc"
+  dependencies:
+    "@lerna/validation-error" "^3.0.0"
+    conventional-changelog-angular "^5.0.1"
+    conventional-changelog-core "^3.1.0"
+    conventional-recommended-bump "^4.0.1"
+    fs-extra "^7.0.0"
+    get-stream "^4.0.0"
+    npm-package-arg "^6.0.0"
+    npmlog "^4.1.2"
+    semver "^5.5.0"
+
+"@lerna/create-symlink@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.3.0.tgz#91de00fd576018ba4251f0c6a5b4b7f768f22a82"
+  dependencies:
+    cmd-shim "^2.0.2"
+    fs-extra "^7.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/create@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.4.1.tgz#7cad78a5701d7666a0f5d0fe0e325acd8d8f5b63"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/command" "^3.3.0"
+    "@lerna/npm-conf" "^3.4.1"
+    "@lerna/validation-error" "^3.0.0"
+    camelcase "^4.1.0"
+    dedent "^0.7.0"
+    fs-extra "^7.0.0"
+    globby "^8.0.1"
+    init-package-json "^1.10.3"
+    npm-package-arg "^6.0.0"
+    pify "^3.0.0"
+    semver "^5.5.0"
+    slash "^1.0.0"
+    validate-npm-package-license "^3.0.3"
+    validate-npm-package-name "^3.0.0"
+    whatwg-url "^7.0.0"
+
+"@lerna/describe-ref@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.3.0.tgz#d373adb530d5428ab91e303ccbfcf51a98374a3a"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    npmlog "^4.1.2"
+
+"@lerna/diff@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.3.0.tgz#c8130a5f508b47fad5fec81404498bc3acdf9cb5"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/command" "^3.3.0"
+    "@lerna/validation-error" "^3.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/exec@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.3.2.tgz#95ecaca617fd85abdb91e9a378ed06ec1763d665"
+  dependencies:
+    "@lerna/batch-packages" "^3.1.2"
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/command" "^3.3.0"
+    "@lerna/filter-options" "^3.3.2"
+    "@lerna/run-parallel-batches" "^3.0.0"
+    "@lerna/validation-error" "^3.0.0"
+
+"@lerna/filter-options@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.3.2.tgz#ac90702b7876ff4980dcdeaeac049c433dd01773"
+  dependencies:
+    "@lerna/collect-updates" "^3.3.2"
+    "@lerna/filter-packages" "^3.0.0"
+    dedent "^0.7.0"
+
+"@lerna/filter-packages@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.0.0.tgz#5eb25ad1610f3e2ab845133d1f8d7d40314e838f"
+  dependencies:
+    "@lerna/validation-error" "^3.0.0"
+    multimatch "^2.1.0"
+    npmlog "^4.1.2"
+
+"@lerna/get-npm-exec-opts@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.0.0.tgz#8fc7866e8d8e9a2f2dc385287ba32eb44de8bdeb"
+  dependencies:
+    npmlog "^4.1.2"
+
+"@lerna/global-options@^3.1.3":
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.1.3.tgz#cf85e24655a91d04d4efc9a80c1f83fc768d08ae"
+
+"@lerna/has-npm-version@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.3.0.tgz#8a73c2c437a0e1e68a19ccbd0dd3c014d4d39135"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    semver "^5.5.0"
+
+"@lerna/import@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.3.1.tgz#deca8c93c9cc03c5844b975c6da9937dd7530440"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/command" "^3.3.0"
+    "@lerna/prompt" "^3.3.1"
+    "@lerna/validation-error" "^3.0.0"
+    dedent "^0.7.0"
+    fs-extra "^7.0.0"
+    p-map-series "^1.0.0"
+
+"@lerna/init@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.3.0.tgz#998f3497da3d891867c593b808b6db4b8fc4ccb9"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/command" "^3.3.0"
+    fs-extra "^7.0.0"
+    p-map "^1.2.0"
+    write-json-file "^2.3.0"
+
+"@lerna/link@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.3.0.tgz#c0c05ff52d0f0c659fcf221627edfcd58e477a5c"
+  dependencies:
+    "@lerna/command" "^3.3.0"
+    "@lerna/package-graph" "^3.1.2"
+    "@lerna/symlink-dependencies" "^3.3.0"
+    p-map "^1.2.0"
+    slash "^1.0.0"
+
+"@lerna/list@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.3.2.tgz#1412b3cce2a83b1baa4ff6fb962d50b46c28ec98"
+  dependencies:
+    "@lerna/command" "^3.3.0"
+    "@lerna/filter-options" "^3.3.2"
+    "@lerna/listable" "^3.0.0"
+    "@lerna/output" "^3.0.0"
+
+"@lerna/listable@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.0.0.tgz#27209b1382c87abdbc964220e75c247d803d4199"
+  dependencies:
+    chalk "^2.3.1"
+    columnify "^1.5.4"
+
+"@lerna/log-packed@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.0.4.tgz#6d1f6ce5ca68b9971f2a27f0ecf3c50684be174a"
+  dependencies:
+    byte-size "^4.0.3"
+    columnify "^1.5.4"
+    has-unicode "^2.0.1"
+    npmlog "^4.1.2"
+
+"@lerna/npm-conf@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.4.1.tgz#859e931b0bc9a5eed86309cc09508810c1e7d121"
+  dependencies:
+    config-chain "^1.1.11"
+    pify "^3.0.0"
+
+"@lerna/npm-dist-tag@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.3.0.tgz#e1c5ab67674216d901266a16846b21cc81ff6afd"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/get-npm-exec-opts" "^3.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/npm-install@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.3.0.tgz#16d00ffd668d11b2386b3ac68bdac2cf8320e533"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/get-npm-exec-opts" "^3.0.0"
+    fs-extra "^7.0.0"
+    npm-package-arg "^6.0.0"
+    npmlog "^4.1.2"
+    signal-exit "^3.0.2"
+    write-pkg "^3.1.0"
+
+"@lerna/npm-publish@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.3.1.tgz#30384665d7ee387343332ece62ca231207bbabea"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/get-npm-exec-opts" "^3.0.0"
+    "@lerna/has-npm-version" "^3.3.0"
+    "@lerna/log-packed" "^3.0.4"
+    fs-extra "^7.0.0"
+    npmlog "^4.1.2"
+    p-map "^1.2.0"
+
+"@lerna/npm-run-script@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.3.0.tgz#3c79601c27c67121155b20e039be53130217db72"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/get-npm-exec-opts" "^3.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/output@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.0.0.tgz#4ed4a30ed2f311046b714b3840a090990ba3ce35"
+  dependencies:
+    npmlog "^4.1.2"
+
+"@lerna/package-graph@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.1.2.tgz#b70298a3a8c82e12090da33233bf242223a38f20"
+  dependencies:
+    "@lerna/validation-error" "^3.0.0"
+    npm-package-arg "^6.0.0"
+    semver "^5.5.0"
+
+"@lerna/package@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.0.0.tgz#14afc9a6cb1f7f7b23c1d7c7aa81bdac7d44c0e5"
+  dependencies:
+    npm-package-arg "^6.0.0"
+    write-pkg "^3.1.0"
+
+"@lerna/project@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.0.0.tgz#4320d2a2b4080cabcf95161d9c48475217d8a545"
+  dependencies:
+    "@lerna/package" "^3.0.0"
+    "@lerna/validation-error" "^3.0.0"
+    cosmiconfig "^5.0.2"
+    dedent "^0.7.0"
+    dot-prop "^4.2.0"
+    glob-parent "^3.1.0"
+    globby "^8.0.1"
+    load-json-file "^4.0.0"
+    npmlog "^4.1.2"
+    p-map "^1.2.0"
+    resolve-from "^4.0.0"
+    write-json-file "^2.3.0"
+
+"@lerna/prompt@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-3.3.1.tgz#ec53f9034a7a02a671627241682947f65078ab88"
+  dependencies:
+    inquirer "^6.2.0"
+    npmlog "^4.1.2"
+
+"@lerna/publish@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.4.1.tgz#abbbc656b3bfafc2289399a46da060b90f6baf32"
+  dependencies:
+    "@lerna/batch-packages" "^3.1.2"
+    "@lerna/check-working-tree" "^3.3.0"
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/collect-updates" "^3.3.2"
+    "@lerna/command" "^3.3.0"
+    "@lerna/describe-ref" "^3.3.0"
+    "@lerna/get-npm-exec-opts" "^3.0.0"
+    "@lerna/npm-conf" "^3.4.1"
+    "@lerna/npm-dist-tag" "^3.3.0"
+    "@lerna/npm-publish" "^3.3.1"
+    "@lerna/output" "^3.0.0"
+    "@lerna/prompt" "^3.3.1"
+    "@lerna/run-lifecycle" "^3.4.1"
+    "@lerna/run-parallel-batches" "^3.0.0"
+    "@lerna/validation-error" "^3.0.0"
+    "@lerna/version" "^3.4.1"
+    fs-extra "^7.0.0"
+    libnpmaccess "^3.0.0"
+    npm-package-arg "^6.0.0"
+    npm-registry-fetch "^3.8.0"
+    npmlog "^4.1.2"
+    p-finally "^1.0.0"
+    p-map "^1.2.0"
+    p-pipe "^1.2.0"
+    p-reduce "^1.0.0"
+    semver "^5.5.0"
+
+"@lerna/resolve-symlink@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.3.0.tgz#c5d99a60cb17e2ea90b3521a0ba445478d194a44"
+  dependencies:
+    fs-extra "^7.0.0"
+    npmlog "^4.1.2"
+    read-cmd-shim "^1.0.1"
+
+"@lerna/rimraf-dir@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.3.0.tgz#687e9bb3668a9e540e281302a52d9a573860f5db"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    npmlog "^4.1.2"
+    path-exists "^3.0.0"
+    rimraf "^2.6.2"
+
+"@lerna/run-lifecycle@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.4.1.tgz#6d7e44eada31cb4ec78b18ef050da0d86f6c892b"
+  dependencies:
+    "@lerna/npm-conf" "^3.4.1"
+    npm-lifecycle "^2.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/run-parallel-batches@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.0.0.tgz#468704934084c74991d3124d80607857d4dfa840"
+  dependencies:
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+
+"@lerna/run@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.3.2.tgz#f521f4a22585c90758f34a584cb1871f8bb2a83e"
+  dependencies:
+    "@lerna/batch-packages" "^3.1.2"
+    "@lerna/command" "^3.3.0"
+    "@lerna/filter-options" "^3.3.2"
+    "@lerna/npm-run-script" "^3.3.0"
+    "@lerna/output" "^3.0.0"
+    "@lerna/run-parallel-batches" "^3.0.0"
+    "@lerna/validation-error" "^3.0.0"
+    p-map "^1.2.0"
+
+"@lerna/symlink-binary@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.3.0.tgz#99ea570b21baabd61ecab27582eeb1d7b2c5f9cf"
+  dependencies:
+    "@lerna/create-symlink" "^3.3.0"
+    "@lerna/package" "^3.0.0"
+    fs-extra "^7.0.0"
+    p-map "^1.2.0"
+    read-pkg "^3.0.0"
+
+"@lerna/symlink-dependencies@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.3.0.tgz#13bcaed3e37986ab01b13498a459c7f609397dc3"
+  dependencies:
+    "@lerna/create-symlink" "^3.3.0"
+    "@lerna/resolve-symlink" "^3.3.0"
+    "@lerna/symlink-binary" "^3.3.0"
+    fs-extra "^7.0.0"
+    p-finally "^1.0.0"
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+
+"@lerna/validation-error@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-3.0.0.tgz#a27e90051c3ba71995e2a800a43d94ad04b3e3f4"
+  dependencies:
+    npmlog "^4.1.2"
+
+"@lerna/version@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.4.1.tgz#029448cccd3ccefb4d5f666933bd13cfb37edab0"
+  dependencies:
+    "@lerna/batch-packages" "^3.1.2"
+    "@lerna/check-working-tree" "^3.3.0"
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/collect-updates" "^3.3.2"
+    "@lerna/command" "^3.3.0"
+    "@lerna/conventional-commits" "^3.4.1"
+    "@lerna/output" "^3.0.0"
+    "@lerna/prompt" "^3.3.1"
+    "@lerna/run-lifecycle" "^3.4.1"
+    "@lerna/validation-error" "^3.0.0"
+    chalk "^2.3.1"
+    dedent "^0.7.0"
+    minimatch "^3.0.4"
+    npmlog "^4.1.2"
+    p-map "^1.2.0"
+    p-pipe "^1.2.0"
+    p-reduce "^1.0.0"
+    p-waterfall "^1.0.0"
+    semver "^5.5.0"
+    slash "^1.0.0"
+    temp-write "^3.4.0"
+
+"@lerna/write-log-file@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-3.0.0.tgz#2f95fee80c6821fe1ee6ccf8173d2b4079debbd2"
+  dependencies:
+    npmlog "^4.1.2"
+    write-file-atomic "^2.3.0"
+
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  dependencies:
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@nodelib/fs.stat@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz#54c5a964462be3d4d78af631363c18d6fa91ac26"
+
+JSONStream@^1.0.4, JSONStream@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agentkeepalive@^3.4.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.1.tgz#4eba75cf2ad258fc09efd506cdb8d8c2971d35a4"
+  dependencies:
+    humanize-ms "^1.2.1"
+
+ajv@^5.3.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+ansi-escapes@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  dependencies:
+    color-convert "^1.9.0"
+
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+
+aproba@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+
+array-differ@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+
+array-ify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+
+arrify@^1.0.0, arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asap@^2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+
+async@^2.5.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  dependencies:
+    lodash "^4.17.10"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+atob@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
+aws4@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  dependencies:
+    tweetnacl "^0.14.3"
+
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  dependencies:
+    inherits "~2.0.0"
+
+bluebird@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+
+builtin-modules@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+
+byline@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
+
+byte-size@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-4.0.3.tgz#b7c095efc68eadf82985fccd9a2df43a74fa2ccd"
+
+cacache@^11.0.1, cacache@^11.0.2:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
+  dependencies:
+    bluebird "^3.5.1"
+    chownr "^1.0.1"
+    figgy-pudding "^3.1.0"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    lru-cache "^4.1.3"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^6.0.0"
+    unique-filename "^1.1.0"
+    y18n "^4.0.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+
+camelcase-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  dependencies:
+    camelcase "^2.0.0"
+    map-obj "^1.0.0"
+
+camelcase-keys@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  dependencies:
+    camelcase "^4.1.0"
+    map-obj "^2.0.0"
+    quick-lru "^1.0.0"
+
+camelcase@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+
+camelcase@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+chalk@^2.0.0, chalk@^2.3.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+
+chownr@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
+
+ci-info@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-width@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+
+cmd-shim@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
+  dependencies:
+    graceful-fs "^4.1.2"
+    mkdirp "~0.5.0"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  dependencies:
+    color-name "1.1.3"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+columnify@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  dependencies:
+    strip-ansi "^3.0.0"
+    wcwidth "^1.0.0"
+
+combined-stream@1.0.6:
+  version "1.0.6"
+  resolved "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+combined-stream@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@~2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+
+compare-func@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
+  dependencies:
+    array-ify "^1.0.0"
+    dot-prop "^3.0.0"
+
+component-emitter@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+concat-stream@^1.5.0, concat-stream@^1.6.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+config-chain@^1.1.11:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+
+conventional-changelog-angular@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.1.tgz#f96431b76de453333a909decd02b15cb5bd2d364"
+  dependencies:
+    compare-func "^1.3.1"
+    q "^1.5.1"
+
+conventional-changelog-core@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.0.tgz#96a81bb3301b4b2a3dc2851cc54c5fb674ac1942"
+  dependencies:
+    conventional-changelog-writer "^4.0.0"
+    conventional-commits-parser "^3.0.0"
+    dateformat "^3.0.0"
+    get-pkg-repo "^1.0.0"
+    git-raw-commits "^2.0.0"
+    git-remote-origin-url "^2.0.0"
+    git-semver-tags "^2.0.0"
+    lodash "^4.2.1"
+    normalize-package-data "^2.3.5"
+    q "^1.5.1"
+    read-pkg "^1.1.0"
+    read-pkg-up "^1.0.1"
+    through2 "^2.0.0"
+
+conventional-changelog-preset-loader@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.1.tgz#d134734e0cc1b91b88b30586c5991f31442029f1"
+
+conventional-changelog-writer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.0.tgz#3ed983c8ef6a3aa51fe44e82c9c75e86f1b5aa42"
+  dependencies:
+    compare-func "^1.3.1"
+    conventional-commits-filter "^2.0.0"
+    dateformat "^3.0.0"
+    handlebars "^4.0.2"
+    json-stringify-safe "^5.0.1"
+    lodash "^4.2.1"
+    meow "^4.0.0"
+    semver "^5.5.0"
+    split "^1.0.0"
+    through2 "^2.0.0"
+
+conventional-commits-filter@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.0.tgz#a0ce1d1ff7a1dd7fab36bee8e8256d348d135651"
+  dependencies:
+    is-subset "^0.1.1"
+    modify-values "^1.0.0"
+
+conventional-commits-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.0.tgz#7f604549a50bd8f60443fbe515484b1c2f06a5c4"
+  dependencies:
+    JSONStream "^1.0.4"
+    is-text-path "^1.0.0"
+    lodash "^4.2.1"
+    meow "^4.0.0"
+    split2 "^2.0.0"
+    through2 "^2.0.0"
+    trim-off-newlines "^1.0.0"
+
+conventional-recommended-bump@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.1.tgz#304a45a412cfec050a10ea2e7e4a89320eaf3991"
+  dependencies:
+    concat-stream "^1.6.0"
+    conventional-changelog-preset-loader "^2.0.1"
+    conventional-commits-filter "^2.0.0"
+    conventional-commits-parser "^3.0.0"
+    git-raw-commits "^2.0.0"
+    git-semver-tags "^2.0.0"
+    meow "^4.0.0"
+    q "^1.5.1"
+
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+cosmiconfig@^5.0.2:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^4.0.0"
+
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+currently-unhandled@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  dependencies:
+    array-find-index "^1.0.1"
+
+cyclist@~0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+
+dargs@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  dependencies:
+    assert-plus "^1.0.0"
+
+dateformat@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+
+debug@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+debug@^2.2.0, debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.1.0:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407"
+  dependencies:
+    ms "^2.1.1"
+
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+
+decamelize-keys@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  dependencies:
+    decamelize "^1.1.0"
+    map-obj "^1.0.0"
+
+decamelize@^1.1.0, decamelize@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+decamelize@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  dependencies:
+    xregexp "4.0.0"
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  dependencies:
+    clone "^1.0.2"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+detect-indent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
+
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
+dir-glob@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  dependencies:
+    arrify "^1.0.1"
+    path-type "^3.0.0"
+
+dot-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  dependencies:
+    is-obj "^1.0.0"
+
+dot-prop@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  dependencies:
+    is-obj "^1.0.0"
+
+duplexer@^0.1.1:
+  version "0.1.1"
+  resolved "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+encoding@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  dependencies:
+    iconv-lite "~0.4.13"
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  dependencies:
+    once "^1.4.0"
+
+err-code@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+
+error-ex@^1.2.0, error-ex@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  dependencies:
+    is-arrayish "^0.2.1"
+
+es6-promise@^4.0.3:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  dependencies:
+    es6-promise "^4.0.3"
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+esprima@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+
+execa@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+
+external-editor@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
+fast-deep-equal@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+
+fast-glob@^2.0.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.3.tgz#d09d378e9ef6b0076a0fa1ba7519d9d4d9699c28"
+  dependencies:
+    "@mrmlnc/readdir-enhanced" "^2.2.1"
+    "@nodelib/fs.stat" "^1.0.1"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.1"
+    micromatch "^3.1.10"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
+figgy-pudding@^3.1.0, figgy-pudding@^3.2.1, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+find-up@^2.0.0, find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  dependencies:
+    locate-path "^2.0.0"
+
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  dependencies:
+    locate-path "^3.0.0"
+
+flush-write-stream@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.4"
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "1.0.6"
+    mime-types "^2.1.12"
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  dependencies:
+    map-cache "^0.2.2"
+
+from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-extra@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+fstream@^1.0.0, fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+genfun@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/genfun/-/genfun-4.0.1.tgz#ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1"
+
+get-caller-file@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+
+get-pkg-repo@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    meow "^3.3.0"
+    normalize-package-data "^2.3.0"
+    parse-github-repo-url "^1.3.0"
+    through2 "^2.0.0"
+
+get-port@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
+
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  dependencies:
+    pump "^3.0.0"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  dependencies:
+    assert-plus "^1.0.0"
+
+git-raw-commits@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
+  dependencies:
+    dargs "^4.0.1"
+    lodash.template "^4.0.2"
+    meow "^4.0.0"
+    split2 "^2.0.0"
+    through2 "^2.0.0"
+
+git-remote-origin-url@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+  dependencies:
+    gitconfiglocal "^1.0.0"
+    pify "^2.3.0"
+
+git-semver-tags@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.0.tgz#c218fd895bdf8e8e02f6bde555b2c3893ac73cd7"
+  dependencies:
+    meow "^4.0.0"
+    semver "^5.5.0"
+
+gitconfiglocal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+  dependencies:
+    ini "^1.3.2"
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globby@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    fast-glob "^2.0.2"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+handlebars@^4.0.2:
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+  dependencies:
+    async "^2.5.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+
+har-validator@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  dependencies:
+    ajv "^5.3.0"
+    har-schema "^2.0.0"
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
+has-unicode@^2.0.0, has-unicode@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+
+http-cache-semantics@^3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-proxy-agent@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  dependencies:
+    agent-base "^4.1.0"
+    debug "^3.1.0"
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  dependencies:
+    ms "^2.0.0"
+
+iconv-lite@^0.4.24, iconv-lite@~0.4.13:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
+ignore@^3.3.5:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+
+import-local@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  dependencies:
+    repeating "^2.0.0"
+
+indent-string@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+ini@^1.3.2, ini@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+
+init-package-json@^1.10.3:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz#45ffe2f610a8ca134f2bd1db5637b235070f6cbe"
+  dependencies:
+    glob "^7.1.1"
+    npm-package-arg "^4.0.0 || ^5.0.0 || ^6.0.0"
+    promzard "^0.3.0"
+    read "~1.0.1"
+    read-package-json "1 || 2"
+    semver "2.x || 3.x || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+    validate-npm-package-name "^3.0.0"
+
+inquirer@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.0"
+    figures "^2.0.0"
+    lodash "^4.17.10"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.1.0"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+
+ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  dependencies:
+    kind-of "^6.0.0"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
+is-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-ci@^1.0.10:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
+  dependencies:
+    ci-info "^1.5.0"
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  dependencies:
+    kind-of "^6.0.0"
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+
+is-finite@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  dependencies:
+    isobject "^3.0.1"
+
+is-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
+is-subset@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+
+is-text-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+  dependencies:
+    text-extensions "^1.0.0"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+
+isarray@1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+js-yaml@^3.9.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonparse@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  dependencies:
+    invert-kv "^2.0.0"
+
+lerna@^3.2.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.4.1.tgz#4acc5a6b9d843993db7a7bb1350274bcaf20ca80"
+  dependencies:
+    "@lerna/add" "^3.4.1"
+    "@lerna/bootstrap" "^3.4.1"
+    "@lerna/changed" "^3.4.1"
+    "@lerna/clean" "^3.3.2"
+    "@lerna/cli" "^3.2.0"
+    "@lerna/create" "^3.4.1"
+    "@lerna/diff" "^3.3.0"
+    "@lerna/exec" "^3.3.2"
+    "@lerna/import" "^3.3.1"
+    "@lerna/init" "^3.3.0"
+    "@lerna/link" "^3.3.0"
+    "@lerna/list" "^3.3.2"
+    "@lerna/publish" "^3.4.1"
+    "@lerna/run" "^3.3.2"
+    "@lerna/version" "^3.4.1"
+    import-local "^1.0.0"
+    npmlog "^4.1.2"
+
+libnpmaccess@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.0.tgz#33cc9c8a5cb53e87d06bf2e547c2eba974f619af"
+  dependencies:
+    aproba "^2.0.0"
+    get-stream "^4.0.0"
+    npm-package-arg "^6.1.0"
+    npm-registry-fetch "^3.8.0"
+
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+lodash._reinterpolate@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+
+lodash.template@^4.0.2:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+
+lodash@^4.17.10, lodash@^4.17.5, lodash@^4.2.1:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+
+loud-rejection@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  dependencies:
+    currently-unhandled "^0.4.1"
+    signal-exit "^3.0.0"
+
+lru-cache@^4.1.2, lru-cache@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+make-dir@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  dependencies:
+    pify "^3.0.0"
+
+make-fetch-happen@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
+  dependencies:
+    agentkeepalive "^3.4.1"
+    cacache "^11.0.1"
+    http-cache-semantics "^3.8.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^4.1.2"
+    mississippi "^3.0.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^4.0.0"
+    ssri "^6.0.0"
+
+map-age-cleaner@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
+  dependencies:
+    p-defer "^1.0.0"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+
+map-obj@^1.0.0, map-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+
+map-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  dependencies:
+    object-visit "^1.0.0"
+
+mem@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
+  dependencies:
+    map-age-cleaner "^0.1.1"
+    mimic-fn "^1.0.0"
+    p-is-promise "^1.1.0"
+
+meow@^3.3.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  dependencies:
+    camelcase-keys "^2.0.0"
+    decamelize "^1.1.2"
+    loud-rejection "^1.0.0"
+    map-obj "^1.0.1"
+    minimist "^1.1.3"
+    normalize-package-data "^2.3.4"
+    object-assign "^4.0.1"
+    read-pkg-up "^1.0.1"
+    redent "^1.0.0"
+    trim-newlines "^1.0.0"
+
+meow@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
+  dependencies:
+    camelcase-keys "^4.0.0"
+    decamelize-keys "^1.0.0"
+    loud-rejection "^1.0.0"
+    minimist "^1.1.3"
+    minimist-options "^3.0.1"
+    normalize-package-data "^2.3.4"
+    read-pkg-up "^3.0.0"
+    redent "^2.0.0"
+    trim-newlines "^2.0.0"
+
+merge2@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34"
+
+micromatch@^3.1.10:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+mime-db@~1.36.0:
+  version "1.36.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+
+mime-types@^2.1.12, mime-types@~2.1.19:
+  version "2.1.20"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  dependencies:
+    mime-db "~1.36.0"
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+
+minimatch@^3.0.0, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist-options@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@^1.1.3, minimist@^1.2.0:
+  version "1.2.0"
+  resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
+minipass@^2.2.1, minipass@^2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+  version "0.5.1"
+  resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+modify-values@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
+
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+ms@^2.0.0, ms@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+
+multimatch@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+  dependencies:
+    array-differ "^1.0.0"
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    minimatch "^3.0.0"
+
+mute-stream@0.0.7, mute-stream@~0.0.4:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+
+node-fetch-npm@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
+  dependencies:
+    encoding "^0.1.11"
+    json-parse-better-errors "^1.0.0"
+    safe-buffer "^5.1.1"
+
+node-gyp@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  dependencies:
+    fstream "^1.0.0"
+    glob "^7.0.3"
+    graceful-fs "^4.1.2"
+    mkdirp "^0.5.0"
+    nopt "2 || 3"
+    npmlog "0 || 1 || 2 || 3 || 4"
+    osenv "0"
+    request "^2.87.0"
+    rimraf "2"
+    semver "~5.3.0"
+    tar "^2.0.0"
+    which "1"
+
+"nopt@2 || 3":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  dependencies:
+    abbrev "1"
+
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+npm-bundled@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+
+npm-lifecycle@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.0.tgz#1eda2eedb82db929e3a0c50341ab0aad140ed569"
+  dependencies:
+    byline "^5.0.0"
+    graceful-fs "^4.1.11"
+    node-gyp "^3.8.0"
+    resolve-from "^4.0.0"
+    slide "^1.1.6"
+    uid-number "0.0.6"
+    umask "^1.1.0"
+    which "^1.3.1"
+
+"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+  dependencies:
+    hosted-git-info "^2.6.0"
+    osenv "^0.1.5"
+    semver "^5.5.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-packlist@^1.1.10:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
+npm-pick-manifest@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.1.0.tgz#dc381bdd670c35d81655e1d5a94aa3dd4d87fce5"
+  dependencies:
+    npm-package-arg "^6.0.0"
+    semver "^5.4.1"
+
+npm-registry-fetch@^3.0.0, npm-registry-fetch@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc"
+  dependencies:
+    JSONStream "^1.3.4"
+    bluebird "^3.5.1"
+    figgy-pudding "^3.4.1"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    npm-package-arg "^6.1.0"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  dependencies:
+    path-key "^2.0.0"
+
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+
+object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  dependencies:
+    isobject "^3.0.0"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  dependencies:
+    isobject "^3.0.1"
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+optimist@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-locale@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
+  dependencies:
+    execa "^0.10.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+osenv@0, osenv@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+
+p-is-promise@^1.1.0:
+  version "1.1.0"
+  resolved "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+
+p-limit@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  dependencies:
+    p-try "^1.0.0"
+
+p-limit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  dependencies:
+    p-limit "^1.1.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  dependencies:
+    p-limit "^2.0.0"
+
+p-map-series@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
+  dependencies:
+    p-reduce "^1.0.0"
+
+p-map@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+
+p-pipe@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
+
+p-reduce@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+
+p-try@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+
+p-waterfall@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-waterfall/-/p-waterfall-1.0.0.tgz#7ed94b3ceb3332782353af6aae11aa9fc235bb00"
+  dependencies:
+    p-reduce "^1.0.0"
+
+pacote@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.0.tgz#59810859bbd72984dcb267269259375d32f391e5"
+  dependencies:
+    bluebird "^3.5.1"
+    cacache "^11.0.2"
+    figgy-pudding "^3.2.1"
+    get-stream "^3.0.0"
+    glob "^7.1.2"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    minimatch "^3.0.4"
+    minipass "^2.3.3"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.10"
+    npm-pick-manifest "^2.1.0"
+    npm-registry-fetch "^3.0.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.0"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.5.0"
+    ssri "^6.0.0"
+    tar "^4.4.3"
+    unique-filename "^1.1.0"
+    which "^1.3.0"
+
+parallel-transform@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  dependencies:
+    cyclist "~0.2.2"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
+parse-github-repo-url@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
+
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  dependencies:
+    error-ex "^1.2.0"
+
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  dependencies:
+    pify "^3.0.0"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+
+pify@^2.0.0, pify@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  dependencies:
+    find-up "^2.1.0"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+
+promise-retry@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  dependencies:
+    err-code "^1.0.0"
+    retry "^0.10.0"
+
+promzard@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
+  dependencies:
+    read "1"
+
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+
+protoduck@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.0.tgz#752145e6be0ad834cb25716f670a713c860dce70"
+  dependencies:
+    genfun "^4.0.1"
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+
+psl@^1.1.24:
+  version "1.1.29"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+
+q@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+
+quick-lru@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+
+read-cmd-shim@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
+  dependencies:
+    graceful-fs "^4.1.2"
+
+"read-package-json@1 || 2", read-package-json@^2.0.0:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  dependencies:
+    glob "^7.1.1"
+    json-parse-better-errors "^1.0.1"
+    normalize-package-data "^2.0.0"
+    slash "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-tree@^5.1.6:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.1.tgz#6218b187d6fac82289ce4387bbbaf8eef536ad63"
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^3.0.0"
+
+read-pkg@^1.0.0, read-pkg@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
+read-pkg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  dependencies:
+    load-json-file "^4.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^3.0.0"
+
+read@1, read@~1.0.1:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+  dependencies:
+    mute-stream "~0.0.4"
+
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2:
+  version "2.3.6"
+  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
+redent@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  dependencies:
+    indent-string "^2.1.0"
+    strip-indent "^1.0.1"
+
+redent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  dependencies:
+    indent-string "^3.0.0"
+    strip-indent "^2.0.0"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+repeat-element@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  dependencies:
+    is-finite "^1.0.0"
+
+request@^2.87.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  dependencies:
+    resolve-from "^3.0.0"
+
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
+retry@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+
+rimraf@2, rimraf@^2.5.4, rimraf@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  dependencies:
+    glob "^7.0.5"
+
+run-async@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  dependencies:
+    is-promise "^2.1.0"
+
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  dependencies:
+    aproba "^1.1.1"
+
+rxjs@^6.1.0:
+  version "6.3.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+  dependencies:
+    tslib "^1.9.0"
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
+"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.4.1, semver@^5.5.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+
+semver@~5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
+set-blocking@^2.0.0, set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
+slide@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+
+smart-buffer@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+socks-proxy-agent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
+  dependencies:
+    agent-base "~4.2.0"
+    socks "~2.2.0"
+
+socks@~2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9"
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "^4.0.1"
+
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-map-resolve@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  dependencies:
+    atob "^2.1.1"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+
+source-map@^0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
+spdx-correct@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.2.tgz#19bb409e91b47b1ad54159243f7312a858db3c2e"
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  dependencies:
+    extend-shallow "^3.0.0"
+
+split2@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
+  dependencies:
+    through2 "^2.0.2"
+
+split@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  dependencies:
+    through "2"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+sshpk@^1.7.0:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+    safer-buffer "^2.0.2"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+ssri@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  dependencies:
+    figgy-pudding "^3.5.1"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  dependencies:
+    is-utf8 "^0.2.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+
+strip-indent@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  dependencies:
+    get-stdin "^4.0.1"
+
+strip-indent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+
+strong-log-transformer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.0.0.tgz#fa6d8e0a9e62b3c168c3cad5ae5d00dc97ba26cc"
+  dependencies:
+    byline "^5.0.0"
+    duplexer "^0.1.1"
+    minimist "^1.2.0"
+    through "^2.3.4"
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  dependencies:
+    has-flag "^3.0.0"
+
+tar@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.2"
+    inherits "2"
+
+tar@^4.4.3:
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.3"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
+temp-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+
+temp-write@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492"
+  dependencies:
+    graceful-fs "^4.1.2"
+    is-stream "^1.1.0"
+    make-dir "^1.0.0"
+    pify "^3.0.0"
+    temp-dir "^1.0.0"
+    uuid "^3.0.1"
+
+text-extensions@^1.0.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.8.0.tgz#6f343c62268843019b21a616a003557bdb952d2b"
+
+through2@^2.0.0, through2@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  dependencies:
+    readable-stream "^2.1.5"
+    xtend "~4.0.1"
+
+through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
+  version "2.3.8"
+  resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  dependencies:
+    psl "^1.1.24"
+    punycode "^1.4.1"
+
+tr46@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  dependencies:
+    punycode "^2.1.0"
+
+trim-newlines@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+
+trim-newlines@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+
+trim-off-newlines@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
+
+tslib@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+
+uglify-js@^3.1.4:
+  version "3.4.9"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+  dependencies:
+    commander "~2.17.1"
+    source-map "~0.6.1"
+
+uid-number@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+
+umask@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
+
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
+unique-filename@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
+  dependencies:
+    imurmurhash "^0.1.4"
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+uuid@^3.0.1, uuid@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+
+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+validate-npm-package-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  dependencies:
+    builtins "^1.0.3"
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+wcwidth@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  dependencies:
+    defaults "^1.0.3"
+
+webidl-conversions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+
+whatwg-url@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+
+which@1, which@^1.2.9, which@^1.3.0, which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  dependencies:
+    string-width "^1.0.2 || 2"
+
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
+write-json-file@^2.2.0, write-json-file@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
+  dependencies:
+    detect-indent "^5.0.0"
+    graceful-fs "^4.1.2"
+    make-dir "^1.0.0"
+    pify "^3.0.0"
+    sort-keys "^2.0.0"
+    write-file-atomic "^2.0.0"
+
+write-pkg@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.2.0.tgz#0e178fe97820d389a8928bc79535dbe68c2cff21"
+  dependencies:
+    sort-keys "^2.0.0"
+    write-json-file "^2.2.0"
+
+xregexp@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+
+xtend@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
+yargs-parser@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs@^12.0.1:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^2.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^10.1.0"
diff --git a/scm-ui/package.json b/scm-ui/package.json
index 3bb9d81ab5..ebb67ef38e 100644
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -17,6 +17,7 @@
     "i18next-fetch-backend": "^0.1.0",
     "moment": "^2.22.2",
     "node-sass": "^4.9.3",
+    "postcss-easy-import": "^3.0.0",
     "react": "^16.4.2",
     "react-diff-view": "^1.7.0",
     "react-dom": "^16.4.2",
@@ -52,6 +53,7 @@
     "fetch-mock": "^6.5.0",
     "flow-typed": "^2.5.1",
     "jest": "^23.5.0",
+    "postcss-easy-import": "^3.0.0",
     "node-sass-chokidar": "^1.3.0",
     "npm-run-all": "^4.1.3",
     "prettier": "^1.13.7",
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index b26d5a9e53..b021e9d379 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -104,16 +104,6 @@ class RepositoryRoot extends React.Component<Props> {
               path={`${url}/edit`}
               component={() => <Edit repository={repository} />}
             />
-            <Route
-              path={`${url}/diff`}
-              component={() => (
-                <ScmDiff
-                  namespace={"scmadmin"}
-                  name={"foo"}
-                  revision={"4c18735d4c3bd89242284ed3eac52592637024b6"}
-                />
-              )}
-            />
             <Route
               path={`${url}/permissions`}
               render={props => (
@@ -123,6 +113,16 @@ class RepositoryRoot extends React.Component<Props> {
                 />
               )}
             />
+            <Route
+              path={`${url}/diff`}
+              component={() => (
+                <ScmDiff
+                  namespace={repository.namespace}
+                  name={repository.name}
+                  revision={"db64ca5992ad8e327c7687d49f5297bef7b29893"}
+                />
+              )}
+            />
           </div>
           <div className="column">
             <Navigation>
diff --git a/scm-ui/src/repos/containers/ScmDiff.js b/scm-ui/src/repos/containers/ScmDiff.js
index f8bf218812..622496f2af 100644
--- a/scm-ui/src/repos/containers/ScmDiff.js
+++ b/scm-ui/src/repos/containers/ScmDiff.js
@@ -1,8 +1,8 @@
 // @flow
 
 import React from "react";
-import { Diff, Hunk, parseDiff } from "react-diff-view";
-import { apiClient } from "@scm-manager/ui-components";
+import {Diff, Hunk, parseDiff} from "react-diff-view";
+import {apiClient} from "@scm-manager/ui-components";
 
 type Props = {
   namespace: string,
@@ -17,13 +17,13 @@ class ScmDiff extends React.Component<Props> {
   }
 
   componentDidMount() {
-    const { namespace, name, revision } = this.props;
-    const url = `http://localhost:8081/scm/api/rest/v2/repositories/${namespace}/${name}/diff/${revision}`;
+    const {namespace, name, revision} = this.props;
+    const url = `/repositories/${namespace}/${name}/diff/${revision}`;
     apiClient
       .get(url)
       .then(response => response.text())
-      .then(text => this.setState({ diff: text }))
-      .catch(error => this.setState({ error }));
+      .then(text => this.setState({diff: text}))
+      .catch(error => this.setState({error}));
   }
 
   render() {
@@ -31,11 +31,18 @@ class ScmDiff extends React.Component<Props> {
       return null;
     }
     const files = parseDiff(this.state.diff);
+
+    const renderFile = ({newPath, oldRevision, newRevision, type, hunks}) => (
+      <div>
+        <div> File: {newPath} </div>
+        <Diff key={oldRevision + '-' + newRevision}  diffType={type} hunks={hunks} viewType="split">
+        </Diff>
+      </div>
+    );
+
     return (
       <div>
-        {files.map(({ hunks }, i) => (
-          <Diff key={i} hunks={hunks} viewType="unified" />
-        ))}
+        {files.map(renderFile)}
       </div>
     );
   }
diff --git a/scm-ui/yarn.lock b/scm-ui/yarn.lock
index 403f599ad6..da044aad2d 100644
--- a/scm-ui/yarn.lock
+++ b/scm-ui/yarn.lock
@@ -1830,7 +1830,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   dependencies:
@@ -3677,6 +3677,16 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 globule@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
@@ -6491,7 +6501,7 @@ performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
 
-pify@^2.0.0:
+pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
@@ -6549,6 +6559,41 @@ posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
 
+postcss-easy-import@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-easy-import/-/postcss-easy-import-3.0.0.tgz#8eaaf5ae59566083d0cae98735dfd803e3ab194d"
+  dependencies:
+    globby "^6.1.0"
+    is-glob "^4.0.0"
+    lodash "^4.17.4"
+    object-assign "^4.0.1"
+    pify "^3.0.0"
+    postcss "^6.0.11"
+    postcss-import "^10.0.0"
+    resolve "^1.1.7"
+
+postcss-import@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-10.0.0.tgz#4c85c97b099136cc5ea0240dc1dfdbfde4e2ebbe"
+  dependencies:
+    object-assign "^4.0.1"
+    postcss "^6.0.1"
+    postcss-value-parser "^3.2.3"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
+postcss-value-parser@^3.2.3:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+
+postcss@^6.0.1, postcss@^6.0.11:
+  version "6.0.23"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.4.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -6842,6 +6887,12 @@ react@^16.4.2:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
+read-cache@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  dependencies:
+    pify "^2.3.0"
+
 read-only-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
@@ -7646,7 +7697,7 @@ source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, sour
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
-source-map@^0.6.0, source-map@~0.6.0, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
@@ -7909,7 +7960,7 @@ supports-color@^3.1.2:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^5.3.0:
+supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   dependencies:

From 78260a708f18fd1bec5244d8f1e49348b5027021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 15 Oct 2018 14:20:04 +0200
Subject: [PATCH 003/188] create new branch


From af81f239e1ed30f7711fa442f8e6a927d2240726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 15 Oct 2018 16:45:44 +0200
Subject: [PATCH 004/188] add head request

---
 scm-ui-components/packages/ui-components/src/apiclient.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scm-ui-components/packages/ui-components/src/apiclient.js b/scm-ui-components/packages/ui-components/src/apiclient.js
index 0b57abeada..4c648a59f6 100644
--- a/scm-ui-components/packages/ui-components/src/apiclient.js
+++ b/scm-ui-components/packages/ui-components/src/apiclient.js
@@ -48,6 +48,10 @@ class ApiClient {
     return this.httpRequestWithJSONBody("PUT", url, contentType, payload);
   }
 
+  head(url: string, payload: any, contentType: string = "application/json") {
+    return this.httpRequestWithJSONBody("HEAD", url, contentType, payload);
+  }
+
   delete(url: string): Promise<Response> {
     let options: RequestOptions = {
       method: "DELETE"

From c23fa319a09af428b46188a7e0da1869be7b3c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 15 Oct 2018 16:45:54 +0200
Subject: [PATCH 005/188] add mockup for content classes

---
 .../src/repos/content/components/Content.js   | 39 +++++++++++++++++++
 .../repos/content/components/Content.test.js  | 23 +++++++++++
 .../content/components/DownloadViewer.js      | 29 ++++++++++++++
 .../repos/content/components/ImageViewer.js   | 29 ++++++++++++++
 .../content/components/SourcecodeViewer.js    | 39 +++++++++++++++++++
 .../components/SourcecodeViewer.test.js       | 22 +++++++++++
 6 files changed, 181 insertions(+)
 create mode 100644 scm-ui/src/repos/content/components/Content.js
 create mode 100644 scm-ui/src/repos/content/components/Content.test.js
 create mode 100644 scm-ui/src/repos/content/components/DownloadViewer.js
 create mode 100644 scm-ui/src/repos/content/components/ImageViewer.js
 create mode 100644 scm-ui/src/repos/content/components/SourcecodeViewer.js
 create mode 100644 scm-ui/src/repos/content/components/SourcecodeViewer.test.js

diff --git a/scm-ui/src/repos/content/components/Content.js b/scm-ui/src/repos/content/components/Content.js
new file mode 100644
index 0000000000..e99692974f
--- /dev/null
+++ b/scm-ui/src/repos/content/components/Content.js
@@ -0,0 +1,39 @@
+// @flow
+import React from "react";
+import { translate } from "react-i18next";
+import { apiClient } from "@scm-manager/ui-components";
+
+type Props = {
+  t: string => string
+};
+
+type State = {
+  contentType: string
+};
+
+class Content extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+
+    this.state = {
+      contentType: ""
+    };
+  }
+
+  componentDidMount() {}
+
+  render() {
+    return null;
+  }
+}
+
+export function getContentType(url: string) {
+  return apiClient
+    .head(url)
+    .then(response => response)
+    .catch(err => {
+      return null;
+    });
+}
+
+export default translate("repos")(Content);
diff --git a/scm-ui/src/repos/content/components/Content.test.js b/scm-ui/src/repos/content/components/Content.test.js
new file mode 100644
index 0000000000..a1828b0872
--- /dev/null
+++ b/scm-ui/src/repos/content/components/Content.test.js
@@ -0,0 +1,23 @@
+//@flow
+import fetchMock from "fetch-mock";
+import { getContentType } from "./Content";
+
+describe("get content type", () => {
+  const CONTENT_URL = "/repositories/scmadmin/TestRepo/content/testContent";
+
+  afterEach(() => {
+    fetchMock.reset();
+    fetchMock.restore();
+  });
+
+  xit("should return content", done => {
+    fetchMock.head("/api/v2" + CONTENT_URL, {
+      "Content-Type": "text/plain"
+    });
+
+    getContentType(CONTENT_URL).then(content => {
+      expect(content).toBe("This is a testContent");
+      done();
+    });
+  });
+});
diff --git a/scm-ui/src/repos/content/components/DownloadViewer.js b/scm-ui/src/repos/content/components/DownloadViewer.js
new file mode 100644
index 0000000000..f2e10b376c
--- /dev/null
+++ b/scm-ui/src/repos/content/components/DownloadViewer.js
@@ -0,0 +1,29 @@
+// @flow
+import React from "react";
+import { translate } from "react-i18next";
+
+type Props = {
+  t: string => string
+};
+
+type State = {
+  content: string
+};
+
+class DownloadViewer extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+
+    this.state = {
+      content: ""
+    };
+  }
+
+  componentDidMount() {}
+
+  render() {
+    return null;
+  }
+}
+
+export default translate("repos")(DownloadViewer);
diff --git a/scm-ui/src/repos/content/components/ImageViewer.js b/scm-ui/src/repos/content/components/ImageViewer.js
new file mode 100644
index 0000000000..de4fc840fa
--- /dev/null
+++ b/scm-ui/src/repos/content/components/ImageViewer.js
@@ -0,0 +1,29 @@
+// @flow
+import React from "react";
+import { translate } from "react-i18next";
+
+type Props = {
+  t: string => string
+};
+
+type State = {
+  content: string
+};
+
+class ImageViewer extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+
+    this.state = {
+      content: ""
+    };
+  }
+
+  componentDidMount() {}
+
+  render() {
+    return null;
+  }
+}
+
+export default translate("repos")(ImageViewer);
diff --git a/scm-ui/src/repos/content/components/SourcecodeViewer.js b/scm-ui/src/repos/content/components/SourcecodeViewer.js
new file mode 100644
index 0000000000..6303bdd874
--- /dev/null
+++ b/scm-ui/src/repos/content/components/SourcecodeViewer.js
@@ -0,0 +1,39 @@
+// @flow
+import React from "react";
+import { translate } from "react-i18next";
+import { apiClient } from "@scm-manager/ui-components";
+
+type Props = {
+  t: string => string
+};
+
+type State = {
+  content: string
+};
+
+class SourcecodeViewer extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+
+    this.state = {
+      content: ""
+    };
+  }
+
+  componentDidMount() {}
+
+  render() {
+    return null;
+  }
+}
+
+export function getContent(url: string) {
+  return apiClient
+    .get(url)
+    .then(response => response.text())
+    .catch(err => {
+      return null;
+    });
+}
+
+export default translate("repos")(SourcecodeViewer);
diff --git a/scm-ui/src/repos/content/components/SourcecodeViewer.test.js b/scm-ui/src/repos/content/components/SourcecodeViewer.test.js
new file mode 100644
index 0000000000..0007db50ba
--- /dev/null
+++ b/scm-ui/src/repos/content/components/SourcecodeViewer.test.js
@@ -0,0 +1,22 @@
+//@flow
+import fetchMock from "fetch-mock";
+import { getContent } from "./SourcecodeViewer";
+
+describe("get content", () => {
+  const CONTENT_URL =
+    "/repositories/scmadmin/TestRepo/content/testContent";
+
+  afterEach(() => {
+    fetchMock.reset();
+    fetchMock.restore();
+  });
+
+  it("should return content", done => {
+    fetchMock.getOnce("/api/v2" + CONTENT_URL, "This is a testContent");
+
+    getContent(CONTENT_URL).then(content => {
+      expect(content).toBe("This is a testContent");
+      done();
+    });
+  });
+});

From 41cc61277ff16ff8e98778aba09995d8a9abf4ca Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 16 Oct 2018 14:14:16 +0200
Subject: [PATCH 006/188] added system property to disable extraction of core
 plugins

---
 .../scm/boot/BootstrapContextListener.java    | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
index 4f7a00ce56..bf7583b2a2 100644
--- a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
@@ -148,13 +148,15 @@ public class BootstrapContextListener implements ServletContextListener
   {
     context = sce.getServletContext();
 
-    PluginIndex index = readCorePluginIndex(context);
-
     File pluginDirectory = getPluginDirectory();
 
     try
     {
-      extractCorePlugins(context, pluginDirectory, index);
+      if (!isCorePluginExtractionDisabled()) {
+        extractCorePlugins(context, pluginDirectory);
+      } else {
+        logger.info("core plugin extraction is disabled");
+      }
 
       ClassLoader cl =
         ClassLoaders.getContextClassLoader(BootstrapContextListener.class);
@@ -181,6 +183,10 @@ public class BootstrapContextListener implements ServletContextListener
     }
   }
 
+  private boolean isCorePluginExtractionDisabled() {
+    return Boolean.getBoolean("sonia.scm.boot.disable-core-plugin-extraction");
+  }
+
   /**
    * Restart the whole webapp context.
    *
@@ -269,17 +275,15 @@ public class BootstrapContextListener implements ServletContextListener
    *
    * @param context
    * @param pluginDirectory
-   * @param lines
-   * @param index
    *
    * @throws IOException
    */
-  private void extractCorePlugins(ServletContext context, File pluginDirectory,
-    PluginIndex index)
-    throws IOException
+  private void extractCorePlugins(ServletContext context, File pluginDirectory) throws IOException
   {
     IOUtil.mkdirs(pluginDirectory);
 
+    PluginIndex index = readCorePluginIndex(context);
+
     for (PluginIndexEntry entry : index)
     {
       extractCorePlugin(context, pluginDirectory, entry);

From b74fb814b8f32ccd238c3a30a377aa88b850152f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 18 Oct 2018 13:12:16 +0200
Subject: [PATCH 007/188] Introduce default error object with context for not
 found exceptions

---
 .../src/main/java/sonia/scm/ContextEntry.java |   27 +
 .../java/sonia/scm/NotFoundException.java     |   68 +-
 .../scm/repository/NamespaceAndName.java      |    6 +-
 .../scm/repository/PathNotFoundException.java |   84 --
 .../RepositoryNotFoundException.java          |    6 +-
 .../repository/RevisionNotFoundException.java |   83 --
 .../repository/api/BrowseCommandBuilder.java  |    3 +-
 .../scm/repository/api/CatCommandBuilder.java |   10 +-
 .../repository/api/DiffCommandBuilder.java    |    7 +-
 .../scm/repository/api/LogCommandBuilder.java |    5 +-
 .../api/ModificationsCommandBuilder.java      |    3 +-
 .../api/RepositoryServiceFactory.java         |   31 -
 .../scm/repository/spi/BrowseCommand.java     |    4 +-
 .../sonia/scm/repository/spi/CatCommand.java  |    7 +-
 .../sonia/scm/repository/spi/DiffCommand.java |    4 +-
 .../sonia/scm/repository/spi/LogCommand.java  |    5 +-
 .../repository/spi/ModificationsCommand.java  |    5 +-
 .../main/java/sonia/scm/web/VndMediaType.java |    1 +
 .../scm/repository/spi/GitBrowseCommand.java  |   15 +-
 .../scm/repository/spi/GitCatCommand.java     |   17 +-
 .../scm/repository/spi/GitLogCommand.java     |    7 +-
 .../repository/spi/GitBrowseCommandTest.java  |    9 +-
 .../scm/repository/spi/GitCatCommandTest.java |   66 +-
 .../scm/repository/spi/HgLogCommandTest.java  |    3 +-
 .../java/sonia/scm/repository/SvnUtil.java    |    9 +-
 .../scm/repository/spi/SvnBrowseCommand.java  |    5 +-
 .../scm/repository/spi/SvnCatCommand.java     |   17 +-
 .../scm/repository/spi/SvnDiffCommand.java    |    5 +-
 .../scm/repository/spi/SvnLogCommand.java     |   11 +-
 .../spi/SvnModificationsCommand.java          |    8 +-
 .../repository/spi/SvnBrowseCommandTest.java  |   11 +-
 .../scm/repository/spi/SvnCatCommandTest.java |   62 +-
 .../scm/repository/spi/SvnLogCommandTest.java |   13 +-
 .../java/sonia/scm/ManagerDaoAdapter.java     |    4 +-
 .../resources/BrowserStreamingOutput.java     |   14 -
 .../rest/resources/DiffStreamingOutput.java   |   17 -
 .../resources/RepositoryImportResource.java   |    1 +
 .../rest/resources/RepositoryResource.java    | 1067 -----------------
 .../api/v2/resources/BranchRootResource.java  |    3 +-
 .../v2/resources/ChangesetRootResource.java   |    6 +-
 .../scm/api/v2/resources/ContentResource.java |   29 +-
 .../api/v2/resources/DiffRootResource.java    |   12 +-
 .../sonia/scm/api/v2/resources/ErrorDto.java  |   34 +
 .../v2/resources/FileHistoryRootResource.java |    5 +-
 .../resources/IdResourceManagerAdapter.java   |    7 +-
 .../resources/ModificationsRootResource.java  |    5 +-
 .../v2/resources/NotFoundExceptionMapper.java |   12 +-
 .../v2/resources/PermissionRootResource.java  |    6 +-
 .../api/v2/resources/RepositoryResource.java  |    4 +-
 .../SingleResourceManagerAdapter.java         |   34 +-
 .../api/v2/resources/SourceRootResource.java  |    8 +-
 .../v2/resources/TagNotFoundException.java    |    7 -
 .../scm/api/v2/resources/TagRootResource.java |   11 +-
 .../sonia/scm/group/DefaultGroupManager.java  |    2 +-
 .../sonia/scm/user/DefaultUserManager.java    |    4 +-
 .../api/v2/resources/ContentResourceTest.java |    6 +-
 .../api/v2/resources/DiffResourceTest.java    |   12 +-
 .../v2/resources/FileHistoryResourceTest.java |    8 +-
 .../v2/resources/SourceRootResourceTest.java  |    9 +-
 .../v2/resources/UserRootResourceTest.java    |    2 +-
 .../web/protocol/HttpProtocolServletTest.java |    2 +-
 61 files changed, 395 insertions(+), 1553 deletions(-)
 create mode 100644 scm-core/src/main/java/sonia/scm/ContextEntry.java
 delete mode 100644 scm-core/src/main/java/sonia/scm/repository/PathNotFoundException.java
 delete mode 100644 scm-core/src/main/java/sonia/scm/repository/RevisionNotFoundException.java
 delete mode 100644 scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
 delete mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagNotFoundException.java

diff --git a/scm-core/src/main/java/sonia/scm/ContextEntry.java b/scm-core/src/main/java/sonia/scm/ContextEntry.java
new file mode 100644
index 0000000000..2dbccbacf7
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/ContextEntry.java
@@ -0,0 +1,27 @@
+package sonia.scm;
+
+import sonia.scm.util.AssertUtil;
+
+public class ContextEntry {
+  private final String type;
+  private final String id;
+
+  ContextEntry(Class type, String id) {
+    this(type.getSimpleName(), id);
+  }
+
+  ContextEntry(String type, String id) {
+      AssertUtil.assertIsNotEmpty(type);
+      AssertUtil.assertIsNotEmpty(id);
+      this.type = type;
+      this.id = id;
+    }
+
+    public String getType () {
+      return type;
+    }
+
+    public String getId () {
+      return id;
+    }
+  }
diff --git a/scm-core/src/main/java/sonia/scm/NotFoundException.java b/scm-core/src/main/java/sonia/scm/NotFoundException.java
index 37546be0b8..929fa617ad 100644
--- a/scm-core/src/main/java/sonia/scm/NotFoundException.java
+++ b/scm-core/src/main/java/sonia/scm/NotFoundException.java
@@ -1,10 +1,72 @@
 package sonia.scm;
 
+import sonia.scm.repository.Repository;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import static java.util.Collections.unmodifiableList;
+import static java.util.stream.Collectors.joining;
+
 public class NotFoundException extends RuntimeException {
-  public NotFoundException(String type, String id) {
-    super(type + " with id '" + id + "' not found");
+
+  private final List<ContextEntry> context;
+
+  public NotFoundException(Class type, String id) {
+    this.context = Collections.singletonList(new ContextEntry(type, id));
   }
 
-  public NotFoundException() {
+  public NotFoundException(String type, String id) {
+    this.context = Collections.singletonList(new ContextEntry(type, id));
   }
+
+  private NotFoundException(List<ContextEntry> context) {
+    this.context = context;
+  }
+
+  public static NotFoundExceptionBuilder notFound(Class type, String id) {
+    NotFoundExceptionBuilder builder = new NotFoundExceptionBuilder();
+    return builder.in(type, id);
+  }
+
+  public static NotFoundExceptionBuilder notFound(String type, String id) {
+    NotFoundExceptionBuilder builder = new NotFoundExceptionBuilder();
+    return builder.in(type, id);
+  }
+
+  public List<ContextEntry> getContext() {
+    return unmodifiableList(context);
+  }
+
+  @Override
+  public String getMessage() {
+    return context.stream()
+      .map(c -> c.getType().toLowerCase() + " with id " + c.getId())
+      .collect(joining(" in ", "could not find ", ""));
+  }
+
+  public static class NotFoundExceptionBuilder {
+    private final List<ContextEntry> context = new LinkedList<>();
+
+    public NotFoundExceptionBuilder in(Repository repository) {
+      this.in(Repository.class, repository.getNamespaceAndName().logString());
+      return this;
+    }
+
+    public NotFoundExceptionBuilder in(Class type, String id) {
+      this.context.add(new ContextEntry(type, id));
+      return this;
+    }
+
+    public NotFoundExceptionBuilder in(String type, String id) {
+      this.context.add(new ContextEntry(type, id));
+      return this;
+    }
+
+    public NotFoundException build() {
+      return new NotFoundException(context);
+    }
+  }
+
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/NamespaceAndName.java b/scm-core/src/main/java/sonia/scm/repository/NamespaceAndName.java
index 7b71078f67..fd0a72ad7c 100644
--- a/scm-core/src/main/java/sonia/scm/repository/NamespaceAndName.java
+++ b/scm-core/src/main/java/sonia/scm/repository/NamespaceAndName.java
@@ -25,9 +25,13 @@ public class NamespaceAndName implements Comparable<NamespaceAndName> {
     return name;
   }
 
+  public String logString() {
+    return getNamespace() + "/" + getName();
+  }
+
   @Override
   public String toString() {
-    return getNamespace() + "/" + getName();
+    return logString();
   }
 
   @Override
diff --git a/scm-core/src/main/java/sonia/scm/repository/PathNotFoundException.java b/scm-core/src/main/java/sonia/scm/repository/PathNotFoundException.java
deleted file mode 100644
index ed62a5967c..0000000000
--- a/scm-core/src/main/java/sonia/scm/repository/PathNotFoundException.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.repository;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import sonia.scm.NotFoundException;
-import sonia.scm.util.Util;
-
-/**
- * Signals that the specified path could be found.
- *
- * @author Sebastian Sdorra
- */
-public class PathNotFoundException extends NotFoundException
-{
-
-  /** Field description */
-  private static final long serialVersionUID = 4629690181172951809L;
-
-  //~--- constructors ---------------------------------------------------------
-
-  /**
-   * Constructs a new {@link PathNotFoundException} 
-   * with the specified path.
-   *
-   *
-   * @param path path which could not be found
-   */
-  public PathNotFoundException(String path)
-  {
-    super("path", Util.nonNull(path));
-    this.path = Util.nonNull(path);
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Return the path which could not be found.
-   *
-   *
-   * @return path which could not be found
-   */
-  public String getPath()
-  {
-    return path;
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private String path;
-}
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java
index 9dd866daa4..9863aeddd3 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java
@@ -45,7 +45,7 @@ public class RepositoryNotFoundException extends NotFoundException
 {
 
   private static final long serialVersionUID = -6583078808900520166L;
-  private static final String TYPE_REPOSITORY = "repository";
+  private static final String TYPE_REPOSITORY = "Repository";
 
   //~--- constructors ---------------------------------------------------------
 
@@ -55,7 +55,7 @@ public class RepositoryNotFoundException extends NotFoundException
    *
    */
   public RepositoryNotFoundException(Repository repository) {
-    super(TYPE_REPOSITORY, repository.getName() + "/"  + repository.getNamespace());
+    super(Repository.class, repository.getNamespaceAndName().logString());
   }
 
   public RepositoryNotFoundException(String repositoryId) {
@@ -63,6 +63,6 @@ public class RepositoryNotFoundException extends NotFoundException
   }
 
   public RepositoryNotFoundException(NamespaceAndName namespaceAndName) {
-    super(TYPE_REPOSITORY, namespaceAndName.toString());
+    super(Repository.class, namespaceAndName.logString());
   }
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/RevisionNotFoundException.java b/scm-core/src/main/java/sonia/scm/repository/RevisionNotFoundException.java
deleted file mode 100644
index 4185e3223d..0000000000
--- a/scm-core/src/main/java/sonia/scm/repository/RevisionNotFoundException.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.repository;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import sonia.scm.NotFoundException;
-import sonia.scm.util.Util;
-
-/**
- * Signals that the specified revision could be found.
- *
- * @author Sebastian Sdorra
- */
-public class RevisionNotFoundException extends NotFoundException {
-
-  /** Field description */
-  private static final long serialVersionUID = -5594008535358811998L;
-
-  //~--- constructors ---------------------------------------------------------
-
-  /**
-   * Constructs a new {@link RevisionNotFoundException} 
-   * with the specified revision.
-   *
-   *
-   * @param revision revision which could not be found
-   */
-  public RevisionNotFoundException(String revision)
-  {
-    super("revision", revision);
-    this.revision = Util.nonNull(revision);
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Return the revision which could not be found.
-   *
-   *
-   * @return revision which could not be found
-   */
-  public String getRevision()
-  {
-    return revision;
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private String revision;
-}
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/BrowseCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/BrowseCommandBuilder.java
index fe39aa0a05..3e5166c2f4 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/BrowseCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/BrowseCommandBuilder.java
@@ -46,7 +46,6 @@ import sonia.scm.repository.FileObjectNameComparator;
 import sonia.scm.repository.PreProcessorUtil;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryCacheKey;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.spi.BrowseCommand;
 import sonia.scm.repository.spi.BrowseCommandRequest;
 
@@ -138,7 +137,7 @@ public final class BrowseCommandBuilder
    *
    * @throws IOException
    */
-  public BrowserResult getBrowserResult() throws IOException, RevisionNotFoundException {
+  public BrowserResult getBrowserResult() throws IOException {
     BrowserResult result = null;
 
     if (disableCache)
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/CatCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/CatCommandBuilder.java
index bf896efed8..d1e0cbc5f1 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/CatCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/CatCommandBuilder.java
@@ -37,9 +37,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.repository.PathNotFoundException;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.spi.CatCommand;
 import sonia.scm.repository.spi.CatCommandRequest;
 import sonia.scm.util.IOUtil;
@@ -107,7 +105,7 @@ public final class CatCommandBuilder
    * @param outputStream output stream for the content
    * @param path file path
    */
-  public void retriveContent(OutputStream outputStream, String path) throws IOException, PathNotFoundException, RevisionNotFoundException {
+  public void retriveContent(OutputStream outputStream, String path) throws IOException {
     getCatResult(outputStream, path);
   }
 
@@ -116,7 +114,7 @@ public final class CatCommandBuilder
    *
    * @param path file path
    */
-  public InputStream getStream(String path) throws IOException, PathNotFoundException, RevisionNotFoundException {
+  public InputStream getStream(String path) throws IOException {
     Preconditions.checkArgument(!Strings.isNullOrEmpty(path),
       "path is required");
 
@@ -139,7 +137,7 @@ public final class CatCommandBuilder
    *
    * @throws IOException
    */
-  public String getContent(String path) throws IOException, PathNotFoundException, RevisionNotFoundException {
+  public String getContent(String path) throws IOException {
     String content = null;
     ByteArrayOutputStream baos = null;
 
@@ -186,7 +184,7 @@ public final class CatCommandBuilder
    * @throws IOException
    */
   private void getCatResult(OutputStream outputStream, String path)
-    throws IOException, PathNotFoundException, RevisionNotFoundException {
+    throws IOException {
     Preconditions.checkNotNull(outputStream, "OutputStream is required");
     Preconditions.checkArgument(!Strings.isNullOrEmpty(path),
       "path is required");
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java
index c0e9e3f622..d8536f9abe 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java
@@ -38,7 +38,6 @@ package sonia.scm.repository.api;
 import com.google.common.base.Preconditions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.spi.DiffCommand;
 import sonia.scm.repository.spi.DiffCommandRequest;
 import sonia.scm.util.IOUtil;
@@ -104,7 +103,7 @@ public final class DiffCommandBuilder
    *
    * @throws IOException
    */
-  public DiffCommandBuilder retriveContent(OutputStream outputStream) throws IOException, RevisionNotFoundException {
+  public DiffCommandBuilder retriveContent(OutputStream outputStream) throws IOException {
     getDiffResult(outputStream);
 
     return this;
@@ -119,7 +118,7 @@ public final class DiffCommandBuilder
    *
    * @throws IOException
    */
-  public String getContent() throws IOException, RevisionNotFoundException {
+  public String getContent() throws IOException {
     String content = null;
     ByteArrayOutputStream baos = null;
 
@@ -199,7 +198,7 @@ public final class DiffCommandBuilder
    *
    * @throws IOException
    */
-  private void getDiffResult(OutputStream outputStream) throws IOException, RevisionNotFoundException {
+  private void getDiffResult(OutputStream outputStream) throws IOException {
     Preconditions.checkNotNull(outputStream, "OutputStream is required");
     Preconditions.checkArgument(request.isValid(),
       "path and/or revision is required");
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/LogCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/LogCommandBuilder.java
index 9c782a781b..f718df5b6e 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/LogCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/LogCommandBuilder.java
@@ -46,7 +46,6 @@ import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.PreProcessorUtil;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryCacheKey;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.spi.LogCommand;
 import sonia.scm.repository.spi.LogCommandRequest;
 
@@ -165,7 +164,7 @@ public final class LogCommandBuilder
    *
    * @throws IOException
    */
-  public Changeset getChangeset(String id) throws IOException, RevisionNotFoundException {
+  public Changeset getChangeset(String id) throws IOException {
     Changeset changeset;
 
     if (disableCache)
@@ -224,7 +223,7 @@ public final class LogCommandBuilder
    *
    * @throws IOException
    */
-  public ChangesetPagingResult getChangesets() throws IOException, RevisionNotFoundException {
+  public ChangesetPagingResult getChangesets() throws IOException {
     ChangesetPagingResult cpr;
 
     if (disableCache)
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/ModificationsCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/ModificationsCommandBuilder.java
index 6459b47cd5..498746cc60 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/ModificationsCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/ModificationsCommandBuilder.java
@@ -13,7 +13,6 @@ import sonia.scm.repository.Modifications;
 import sonia.scm.repository.PreProcessorUtil;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryCacheKey;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.spi.ModificationsCommand;
 import sonia.scm.repository.spi.ModificationsCommandRequest;
 
@@ -67,7 +66,7 @@ public final class ModificationsCommandBuilder {
     return this;
   }
 
-  public Modifications getModifications() throws IOException, RevisionNotFoundException {
+  public Modifications getModifications() throws IOException {
     Modifications modifications;
     if (disableCache) {
       log.info("Get modifications for {} with disabled cache", request);
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
index fbb1ee6b58..7160c2723d 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
@@ -152,37 +152,6 @@ public final class RepositoryServiceFactory
 
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Creates a new RepositoryService for the given repository.
-   *
-   *
-   * @param repositoryId id of the repository
-   *
-   * @return a implementation of RepositoryService
-   *         for the given type of repository
-   *
-   * @throws RepositoryNotFoundException if no repository
-   *         with the given id is available
-   * @throws RepositoryServiceNotFoundException if no repository service
-   *         implementation for this kind of repository is available
-   * @throws IllegalArgumentException if the repository id is null or empty
-   * @throws ScmSecurityException if current user has not read permissions
-   *         for that repository
-   */
-  public RepositoryService create(String repositoryId) throws RepositoryNotFoundException {
-    Preconditions.checkArgument(!Strings.isNullOrEmpty(repositoryId),
-      "a non empty repositoryId is required");
-
-    Repository repository = repositoryManager.get(repositoryId);
-
-    if (repository == null)
-    {
-      throw new RepositoryNotFoundException(repositoryId);
-    }
-
-    return create(repository);
-  }
-
   /**
    * Creates a new RepositoryService for the given repository.
    *
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/BrowseCommand.java b/scm-core/src/main/java/sonia/scm/repository/spi/BrowseCommand.java
index 2c9fff589c..ee37d6243e 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/BrowseCommand.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/BrowseCommand.java
@@ -36,7 +36,6 @@ package sonia.scm.repository.spi;
 //~--- non-JDK imports --------------------------------------------------------
 
 import sonia.scm.repository.BrowserResult;
-import sonia.scm.repository.RevisionNotFoundException;
 
 import java.io.IOException;
 
@@ -60,4 +59,5 @@ public interface BrowseCommand
    *
    * @throws IOException
    */
-  BrowserResult getBrowserResult(BrowseCommandRequest request) throws IOException, RevisionNotFoundException;}
+  BrowserResult getBrowserResult(BrowseCommandRequest request) throws IOException;
+}
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/CatCommand.java b/scm-core/src/main/java/sonia/scm/repository/spi/CatCommand.java
index 06f242783b..81600230db 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/CatCommand.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/CatCommand.java
@@ -33,9 +33,6 @@
 
 package sonia.scm.repository.spi;
 
-import sonia.scm.repository.PathNotFoundException;
-import sonia.scm.repository.RevisionNotFoundException;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -47,7 +44,7 @@ import java.io.OutputStream;
  */
 public interface CatCommand {
 
-  void getCatResult(CatCommandRequest request, OutputStream output) throws IOException, RevisionNotFoundException, PathNotFoundException;
+  void getCatResult(CatCommandRequest request, OutputStream output) throws IOException;
 
-  InputStream getCatResultStream(CatCommandRequest request) throws IOException, RevisionNotFoundException, PathNotFoundException;
+  InputStream getCatResultStream(CatCommandRequest request) throws IOException;
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/DiffCommand.java b/scm-core/src/main/java/sonia/scm/repository/spi/DiffCommand.java
index 105f4e48e1..bba42cd86d 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/DiffCommand.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/DiffCommand.java
@@ -33,8 +33,6 @@
 
 package sonia.scm.repository.spi;
 
-import sonia.scm.repository.RevisionNotFoundException;
-
 import java.io.IOException;
 import java.io.OutputStream;
 
@@ -56,5 +54,5 @@ public interface DiffCommand
    * @throws IOException
    * @throws RuntimeException
    */
-  public void getDiffResult(DiffCommandRequest request, OutputStream output) throws IOException, RevisionNotFoundException;
+  public void getDiffResult(DiffCommandRequest request, OutputStream output) throws IOException;
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/LogCommand.java b/scm-core/src/main/java/sonia/scm/repository/spi/LogCommand.java
index e4a7f3437b..f4babcee72 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/LogCommand.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/LogCommand.java
@@ -37,7 +37,6 @@ package sonia.scm.repository.spi;
 
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
-import sonia.scm.repository.RevisionNotFoundException;
 
 import java.io.IOException;
 
@@ -50,7 +49,7 @@ import java.io.IOException;
  */
 public interface LogCommand {
 
-  Changeset getChangeset(String id) throws IOException, RevisionNotFoundException;
+  Changeset getChangeset(String id) throws IOException;
 
-  ChangesetPagingResult getChangesets(LogCommandRequest request) throws IOException, RevisionNotFoundException;
+  ChangesetPagingResult getChangesets(LogCommandRequest request) throws IOException;
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/ModificationsCommand.java b/scm-core/src/main/java/sonia/scm/repository/spi/ModificationsCommand.java
index e9b40e8a17..322468f827 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/ModificationsCommand.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/ModificationsCommand.java
@@ -32,7 +32,6 @@
 package sonia.scm.repository.spi;
 
 import sonia.scm.repository.Modifications;
-import sonia.scm.repository.RevisionNotFoundException;
 
 import java.io.IOException;
 
@@ -46,8 +45,8 @@ import java.io.IOException;
  */
 public interface ModificationsCommand {
 
-  Modifications getModifications(String revision) throws IOException, RevisionNotFoundException;
+  Modifications getModifications(String revision) throws IOException;
 
-  Modifications getModifications(ModificationsCommandRequest request) throws IOException, RevisionNotFoundException;
+  Modifications getModifications(ModificationsCommandRequest request) throws IOException;
 
 }
diff --git a/scm-core/src/main/java/sonia/scm/web/VndMediaType.java b/scm-core/src/main/java/sonia/scm/web/VndMediaType.java
index 7b6d5cb039..e2a2218d34 100644
--- a/scm-core/src/main/java/sonia/scm/web/VndMediaType.java
+++ b/scm-core/src/main/java/sonia/scm/web/VndMediaType.java
@@ -44,6 +44,7 @@ public class VndMediaType {
 
   public static final String ME = PREFIX + "me" + SUFFIX;
   public static final String SOURCE = PREFIX + "source" + SUFFIX;
+  public static final String ERROR_TYPE = PREFIX + "error" + SUFFIX;
 
   private VndMediaType() {
   }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
index f194796bdc..2be4c34fb8 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
@@ -50,13 +50,12 @@ import org.eclipse.jgit.treewalk.filter.PathFilter;
 import org.eclipse.jgit.treewalk.filter.TreeFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sonia.scm.NotFoundException;
 import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.FileObject;
 import sonia.scm.repository.GitSubModuleParser;
 import sonia.scm.repository.GitUtil;
-import sonia.scm.repository.PathNotFoundException;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.SubRepository;
 import sonia.scm.util.Util;
 
@@ -103,7 +102,7 @@ public class GitBrowseCommand extends AbstractGitCommand
   @Override
   @SuppressWarnings("unchecked")
   public BrowserResult getBrowserResult(BrowseCommandRequest request)
-    throws IOException, RevisionNotFoundException {
+    throws IOException {
     logger.debug("try to create browse result for {}", request);
 
     BrowserResult result;
@@ -157,7 +156,7 @@ public class GitBrowseCommand extends AbstractGitCommand
    */
   private FileObject createFileObject(org.eclipse.jgit.lib.Repository repo,
     BrowseCommandRequest request, ObjectId revId, TreeWalk treeWalk)
-    throws IOException, RevisionNotFoundException {
+    throws IOException {
     FileObject file;
 
     try
@@ -267,7 +266,7 @@ public class GitBrowseCommand extends AbstractGitCommand
 
   private BrowserResult getResult(org.eclipse.jgit.lib.Repository repo,
     BrowseCommandRequest request, ObjectId revId)
-    throws IOException, RevisionNotFoundException {
+    throws IOException {
     BrowserResult result = null;
     RevWalk revWalk = null;
     TreeWalk treeWalk = null;
@@ -364,7 +363,7 @@ public class GitBrowseCommand extends AbstractGitCommand
   private Map<String,
     SubRepository> getSubRepositories(org.eclipse.jgit.lib.Repository repo,
       ObjectId revision)
-    throws IOException, RevisionNotFoundException {
+    throws IOException {
     if (logger.isDebugEnabled())
     {
       logger.debug("read submodules of {} at {}", repository.getName(),
@@ -378,7 +377,7 @@ public class GitBrowseCommand extends AbstractGitCommand
         PATH_MODULES, baos);
       subRepositories = GitSubModuleParser.parse(baos.toString());
     }
-    catch (PathNotFoundException ex)
+    catch (NotFoundException ex)
     {
       logger.trace("could not find .gitmodules", ex);
       subRepositories = Collections.EMPTY_MAP;
@@ -389,7 +388,7 @@ public class GitBrowseCommand extends AbstractGitCommand
 
   private SubRepository getSubRepository(org.eclipse.jgit.lib.Repository repo,
     ObjectId revId, String path)
-    throws IOException, RevisionNotFoundException {
+    throws IOException {
     Map<String, SubRepository> subRepositories = subrepositoryCache.get(revId);
 
     if (subRepositories == null)
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitCatCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitCatCommand.java
index 4b05098d03..40f044ebde 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitCatCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitCatCommand.java
@@ -44,9 +44,8 @@ import org.eclipse.jgit.treewalk.TreeWalk;
 import org.eclipse.jgit.treewalk.filter.PathFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sonia.scm.NotFoundException;
 import sonia.scm.repository.GitUtil;
-import sonia.scm.repository.PathNotFoundException;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.util.Util;
 
 import java.io.Closeable;
@@ -65,7 +64,7 @@ public class GitCatCommand extends AbstractGitCommand implements CatCommand {
   }
 
   @Override
-  public void getCatResult(CatCommandRequest request, OutputStream output) throws IOException, PathNotFoundException, RevisionNotFoundException {
+  public void getCatResult(CatCommandRequest request, OutputStream output) throws IOException {
     logger.debug("try to read content for {}", request);
     try (ClosableObjectLoaderContainer closableObjectLoaderContainer = getLoader(request)) {
       closableObjectLoaderContainer.objectLoader.copyTo(output);
@@ -73,24 +72,24 @@ public class GitCatCommand extends AbstractGitCommand implements CatCommand {
   }
 
   @Override
-  public InputStream getCatResultStream(CatCommandRequest request) throws IOException, PathNotFoundException, RevisionNotFoundException {
+  public InputStream getCatResultStream(CatCommandRequest request) throws IOException {
     logger.debug("try to read content for {}", request);
     return new InputStreamWrapper(getLoader(request));
   }
 
-  void getContent(org.eclipse.jgit.lib.Repository repo, ObjectId revId, String path, OutputStream output) throws IOException, PathNotFoundException, RevisionNotFoundException {
+  void getContent(org.eclipse.jgit.lib.Repository repo, ObjectId revId, String path, OutputStream output) throws IOException {
     try (ClosableObjectLoaderContainer closableObjectLoaderContainer = getLoader(repo, revId, path)) {
       closableObjectLoaderContainer.objectLoader.copyTo(output);
     }
   }
 
-  private ClosableObjectLoaderContainer getLoader(CatCommandRequest request) throws IOException, PathNotFoundException, RevisionNotFoundException {
+  private ClosableObjectLoaderContainer getLoader(CatCommandRequest request) throws IOException {
     org.eclipse.jgit.lib.Repository repo = open();
     ObjectId revId = getCommitOrDefault(repo, request.getRevision());
     return getLoader(repo, revId, request.getPath());
   }
 
-  private ClosableObjectLoaderContainer getLoader(Repository repo, ObjectId revId, String path) throws IOException, PathNotFoundException, RevisionNotFoundException {
+  private ClosableObjectLoaderContainer getLoader(Repository repo, ObjectId revId, String path) throws IOException {
     TreeWalk treeWalk = new TreeWalk(repo);
     treeWalk.setRecursive(Util.nonNull(path).contains("/"));
 
@@ -102,7 +101,7 @@ public class GitCatCommand extends AbstractGitCommand implements CatCommand {
     try {
       entry = revWalk.parseCommit(revId);
     } catch (MissingObjectException e) {
-      throw new RevisionNotFoundException(revId.getName());
+      throw NotFoundException.notFound("Revision", revId.getName()).in(repository).build();
     }
     RevTree revTree = entry.getTree();
 
@@ -120,7 +119,7 @@ public class GitCatCommand extends AbstractGitCommand implements CatCommand {
 
       return new ClosableObjectLoaderContainer(loader, treeWalk, revWalk);
     } else {
-      throw new PathNotFoundException(path);
+      throw NotFoundException.notFound("Path", path).in("Revision", revId.getName()).in(repository).build();
     }
   }
 
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
index 4e9261f517..40b25ef75a 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
@@ -48,12 +48,12 @@ import org.eclipse.jgit.treewalk.filter.PathFilter;
 import org.eclipse.jgit.treewalk.filter.TreeFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sonia.scm.NotFoundException;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.GitChangesetConverter;
 import sonia.scm.repository.GitUtil;
 import sonia.scm.repository.InternalRepositoryException;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.util.IOUtil;
 
 import java.io.IOException;
@@ -85,7 +85,6 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
    *
    * @param context
    * @param repository
-   * @param repositoryDirectory
    */
   GitLogCommand(GitContext context, sonia.scm.repository.Repository repository)
   {
@@ -162,7 +161,7 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
    */
   @Override
   @SuppressWarnings("unchecked")
-  public ChangesetPagingResult getChangesets(LogCommandRequest request) throws RevisionNotFoundException {
+  public ChangesetPagingResult getChangesets(LogCommandRequest request) {
     if (logger.isDebugEnabled()) {
       logger.debug("fetch changesets for request: {}", request);
     }
@@ -249,7 +248,7 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
     }
     catch (MissingObjectException e)
     {
-      throw new RevisionNotFoundException(e.getObjectId().name());
+      throw NotFoundException.notFound("Revision", e.getObjectId().getName()).in(repository).build();
     }
     catch (Exception ex)
     {
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
index d71c85a152..a6e704501e 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
@@ -39,7 +39,6 @@ import org.junit.Test;
 import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.FileObject;
 import sonia.scm.repository.GitConstants;
-import sonia.scm.repository.RevisionNotFoundException;
 
 import java.io.IOException;
 import java.util.List;
@@ -63,7 +62,7 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase
    * Test browse command with default branch.
    */
   @Test
-  public void testDefaultBranch() throws IOException, RevisionNotFoundException {
+  public void testDefaultBranch() throws IOException {
     // without default branch, the repository head should be used
     BrowserResult result = createCommand().getBrowserResult(new BrowseCommandRequest());
     assertNotNull(result);
@@ -93,7 +92,7 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase
   }
 
   @Test
-  public void testBrowse() throws IOException, RevisionNotFoundException {
+  public void testBrowse() throws IOException {
     BrowserResult result =
       createCommand().getBrowserResult(new BrowseCommandRequest());
 
@@ -134,7 +133,7 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase
   }
 
   @Test
-  public void testBrowseSubDirectory() throws IOException, RevisionNotFoundException {
+  public void testBrowseSubDirectory() throws IOException {
     BrowseCommandRequest request = new BrowseCommandRequest();
 
     request.setPath("c");
@@ -181,7 +180,7 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase
   }
 
   @Test
-  public void testRecusive() throws IOException, RevisionNotFoundException {
+  public void testRecusive() throws IOException {
     BrowseCommandRequest request = new BrowseCommandRequest();
 
     request.setRecursive(true);
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitCatCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitCatCommandTest.java
index 3611c9c636..079fcac1da 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitCatCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitCatCommandTest.java
@@ -32,10 +32,13 @@
 
 package sonia.scm.repository.spi;
 
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import sonia.scm.NotFoundException;
 import sonia.scm.repository.GitConstants;
-import sonia.scm.repository.PathNotFoundException;
-import sonia.scm.repository.RevisionNotFoundException;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -51,9 +54,12 @@ import static org.junit.Assert.assertEquals;
  * @author Sebastian Sdorra
  */
 public class GitCatCommandTest extends AbstractGitCommandTestBase {
-  
+
+  @Rule
+  public final ExpectedException expectedException = ExpectedException.none();
+
   @Test
-  public void testDefaultBranch() throws IOException, PathNotFoundException, RevisionNotFoundException {
+  public void testDefaultBranch() throws IOException {
     // without default branch, the repository head should be used
     CatCommandRequest request = new CatCommandRequest();
     request.setPath("a.txt");
@@ -66,7 +72,7 @@ public class GitCatCommandTest extends AbstractGitCommandTestBase {
   }
 
   @Test
-  public void testCat() throws IOException, PathNotFoundException, RevisionNotFoundException {
+  public void testCat() throws IOException {
     CatCommandRequest request = new CatCommandRequest();
 
     request.setPath("a.txt");
@@ -75,32 +81,58 @@ public class GitCatCommandTest extends AbstractGitCommandTestBase {
   }
 
   @Test
-  public void testSimpleCat() throws IOException, PathNotFoundException, RevisionNotFoundException {
+  public void testSimpleCat() throws IOException {
     CatCommandRequest request = new CatCommandRequest();
 
     request.setPath("b.txt");
     assertEquals("b", execute(request));
   }
 
-  @Test(expected = PathNotFoundException.class)
-  public void testUnknownFile() throws IOException, PathNotFoundException, RevisionNotFoundException {
+  @Test
+  public void testUnknownFile() throws IOException {
     CatCommandRequest request = new CatCommandRequest();
 
     request.setPath("unknown");
-    execute(request);
-  }
 
-  @Test(expected = RevisionNotFoundException.class)
-  public void testUnknownRevision() throws IOException, PathNotFoundException, RevisionNotFoundException {
-    CatCommandRequest request = new CatCommandRequest();
+    expectedException.expect(new BaseMatcher<Object>() {
+      @Override
+      public void describeTo(Description description) {
+        description.appendText("expected NotFoundException for path");
+      }
+
+      @Override
+      public boolean matches(Object item) {
+        return "Path".equals(((NotFoundException)item).getContext().get(0).getType());
+      }
+    });
 
-    request.setRevision("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-    request.setPath("a.txt");
     execute(request);
   }
 
   @Test
-  public void testSimpleStream() throws IOException, PathNotFoundException, RevisionNotFoundException {
+  public void testUnknownRevision() throws IOException {
+    CatCommandRequest request = new CatCommandRequest();
+
+    request.setRevision("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+    request.setPath("a.txt");
+
+    expectedException.expect(new BaseMatcher<Object>() {
+      @Override
+      public void describeTo(Description description) {
+        description.appendText("expected NotFoundException for revision");
+      }
+
+      @Override
+      public boolean matches(Object item) {
+        return "Revision".equals(((NotFoundException)item).getContext().get(0).getType());
+      }
+    });
+
+    execute(request);
+  }
+
+  @Test
+  public void testSimpleStream() throws IOException {
     CatCommandRequest request = new CatCommandRequest();
     request.setPath("b.txt");
 
@@ -113,7 +145,7 @@ public class GitCatCommandTest extends AbstractGitCommandTestBase {
     catResultStream.close();
   }
 
-  private String execute(CatCommandRequest request) throws IOException, PathNotFoundException, RevisionNotFoundException {
+  private String execute(CatCommandRequest request) throws IOException {
     String content = null;
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgLogCommandTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgLogCommandTest.java
index 29fc46ed57..1daa395e07 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgLogCommandTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgLogCommandTest.java
@@ -39,7 +39,6 @@ import org.junit.Test;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.Modifications;
-import sonia.scm.repository.RevisionNotFoundException;
 
 import java.io.IOException;
 
@@ -151,7 +150,7 @@ public class HgLogCommandTest extends AbstractHgCommandTestBase
   }
 
   @Test
-  public void testGetCommit() throws IOException, RevisionNotFoundException {
+  public void testGetCommit() throws IOException {
     HgLogCommand command = createComamnd();
     String revision = "a9bacaf1b7fa0cebfca71fed4e59ed69a6319427";
     Changeset c =
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnUtil.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnUtil.java
index 480026c27a..deff53eeac 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnUtil.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnUtil.java
@@ -49,6 +49,7 @@ import org.tmatesoft.svn.core.internal.util.SVNEncodingUtil;
 import org.tmatesoft.svn.core.internal.util.SVNXMLUtil;
 import org.tmatesoft.svn.core.io.SVNRepository;
 import org.tmatesoft.svn.core.wc.SVNClientManager;
+import sonia.scm.NotFoundException;
 import sonia.scm.util.HttpUtil;
 import sonia.scm.util.Util;
 
@@ -102,7 +103,7 @@ public final class SvnUtil
 
   //~--- methods --------------------------------------------------------------
 
-  public static long parseRevision(String v) throws RevisionNotFoundException {
+  public static long parseRevision(String v, Repository repository) {
     long result = -1l;
 
     if (!Strings.isNullOrEmpty(v))
@@ -113,7 +114,7 @@ public final class SvnUtil
       }
       catch (NumberFormatException ex)
       {
-        throw new RevisionNotFoundException(v);
+        throw NotFoundException.notFound("Revision", v).in(repository).build();
       }
     }
 
@@ -339,7 +340,7 @@ public final class SvnUtil
     }
   }
 
-  public static long getRevisionNumber(String revision) throws RevisionNotFoundException {
+  public static long getRevisionNumber(String revision, Repository repository) {
     // REVIEW Bei SVN wird ohne Revision die -1 genommen, was zu einem Fehler führt
     long revisionNumber = -1;
 
@@ -351,7 +352,7 @@ public final class SvnUtil
       }
       catch (NumberFormatException ex)
       {
-        throw new RevisionNotFoundException(revision);
+        throw NotFoundException.notFound("Revision", revision).in(repository).build();
       }
     }
 
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
index a75adf6b78..d5627e4d8b 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
@@ -47,7 +47,6 @@ import org.tmatesoft.svn.core.io.SVNRepository;
 import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.FileObject;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.SubRepository;
 import sonia.scm.repository.SvnUtil;
 import sonia.scm.util.Util;
@@ -78,9 +77,9 @@ public class SvnBrowseCommand extends AbstractSvnCommand
 
   @Override
   @SuppressWarnings("unchecked")
-  public BrowserResult getBrowserResult(BrowseCommandRequest request) throws RevisionNotFoundException {
+  public BrowserResult getBrowserResult(BrowseCommandRequest request) {
     String path = request.getPath();
-    long revisionNumber = SvnUtil.getRevisionNumber(request.getRevision());
+    long revisionNumber = SvnUtil.getRevisionNumber(request.getRevision(), repository);
 
     if (logger.isDebugEnabled()) {
       logger.debug("browser repository {} in path {} at revision {}", repository.getName(), path, revisionNumber);
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnCatCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnCatCommand.java
index 4936a16a8c..93d52ea907 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnCatCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnCatCommand.java
@@ -43,10 +43,9 @@ import org.tmatesoft.svn.core.SVNProperties;
 import org.tmatesoft.svn.core.io.SVNRepository;
 import org.tmatesoft.svn.core.wc.SVNClientManager;
 import org.tmatesoft.svn.core.wc.admin.SVNLookClient;
+import sonia.scm.NotFoundException;
 import sonia.scm.repository.InternalRepositoryException;
-import sonia.scm.repository.PathNotFoundException;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.SvnUtil;
 
 import java.io.ByteArrayInputStream;
@@ -79,7 +78,7 @@ public class SvnCatCommand extends AbstractSvnCommand implements CatCommand
   //~--- get methods ----------------------------------------------------------
 
   @Override
-  public void getCatResult(CatCommandRequest request, OutputStream output) throws RevisionNotFoundException, PathNotFoundException {
+  public void getCatResult(CatCommandRequest request, OutputStream output) {
     if (logger.isDebugEnabled())
     {
       logger.debug("try to get content for {}", request);
@@ -96,14 +95,14 @@ public class SvnCatCommand extends AbstractSvnCommand implements CatCommand
     else
     {
 
-      long revisionNumber = SvnUtil.getRevisionNumber(revision);
+      long revisionNumber = SvnUtil.getRevisionNumber(revision, repository);
 
       getCatFromRevision(request, output, revisionNumber);
     }
   }
 
   @Override
-  public InputStream getCatResultStream(CatCommandRequest request) throws RevisionNotFoundException, PathNotFoundException {
+  public InputStream getCatResultStream(CatCommandRequest request) {
     // There seems to be no method creating an input stream as a result, so
     // we have no other possibility then to copy the content into a buffer and
     // stream it from there.
@@ -112,7 +111,7 @@ public class SvnCatCommand extends AbstractSvnCommand implements CatCommand
     return new ByteArrayInputStream(output.toByteArray());
   }
 
-  private void getCatFromRevision(CatCommandRequest request, OutputStream output, long revision) throws PathNotFoundException, RevisionNotFoundException {
+  private void getCatFromRevision(CatCommandRequest request, OutputStream output, long revision) {
     logger.debug("try to read content from revision {} and path {}", revision,
       request.getPath());
 
@@ -129,12 +128,12 @@ public class SvnCatCommand extends AbstractSvnCommand implements CatCommand
     }
   }
 
-  private void handleSvnException(CatCommandRequest request, SVNException ex) throws PathNotFoundException, RevisionNotFoundException {
+  private void handleSvnException(CatCommandRequest request, SVNException ex) {
     int svnErrorCode = ex.getErrorMessage().getErrorCode().getCode();
     if (SVNErrorCode.FS_NOT_FOUND.getCode() == svnErrorCode) {
-      throw new PathNotFoundException(request.getPath());
+      throw NotFoundException.notFound("Path", request.getPath()).in("Revision", request.getRevision()).in(repository).build();
     } else if (SVNErrorCode.FS_NO_SUCH_REVISION.getCode() == svnErrorCode) {
-      throw new RevisionNotFoundException(request.getRevision());
+      throw NotFoundException.notFound("Revision", request.getRevision()).in(repository).build();
     } else {
       throw new InternalRepositoryException("could not get content from revision", ex);
     }
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java
index 0b65466a42..9e81f1a7a9 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java
@@ -48,7 +48,6 @@ import org.tmatesoft.svn.core.wc.SVNDiffClient;
 import org.tmatesoft.svn.core.wc.SVNRevision;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.SvnUtil;
 import sonia.scm.repository.api.DiffFormat;
 import sonia.scm.util.Util;
@@ -76,7 +75,7 @@ public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand
   }
 
   @Override
-  public void getDiffResult(DiffCommandRequest request, OutputStream output) throws RevisionNotFoundException {
+  public void getDiffResult(DiffCommandRequest request, OutputStream output) {
     if (logger.isDebugEnabled())
     {
       logger.debug("create diff for {}", request);
@@ -111,7 +110,7 @@ public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand
       diffGenerator.setDiffDeleted(true);
       diffClient.setDiffGenerator(diffGenerator);
 
-      long currentRev = SvnUtil.getRevisionNumber(request.getRevision());
+      long currentRev = SvnUtil.getRevisionNumber(request.getRevision(), repository);
 
       diffClient.setGitDiffFormat(request.getFormat() == DiffFormat.GIT);
 
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java
index 332dcb55a6..a29b8f4a0c 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java
@@ -47,7 +47,6 @@ import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.SvnUtil;
 import sonia.scm.util.Util;
 
@@ -76,7 +75,7 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
 
   @Override
   @SuppressWarnings("unchecked")
-  public Changeset getChangeset(String revision) throws RevisionNotFoundException {
+  public Changeset getChangeset(String revision) {
     Changeset changeset = null;
 
     if (logger.isDebugEnabled())
@@ -86,7 +85,7 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
 
     try
     {
-      long revisioNumber = parseRevision(revision);
+      long revisioNumber = parseRevision(revision, repository);
       SVNRepository repo = open();
       Collection<SVNLogEntry> entries = repo.log(null, null, revisioNumber,
                                           revisioNumber, true, true);
@@ -106,7 +105,7 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
 
   @Override
   @SuppressWarnings("unchecked")
-  public ChangesetPagingResult getChangesets(LogCommandRequest request) throws RevisionNotFoundException {
+  public ChangesetPagingResult getChangesets(LogCommandRequest request) {
     if (logger.isDebugEnabled())
     {
       logger.debug("fetch changesets for {}", request);
@@ -115,8 +114,8 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
     ChangesetPagingResult changesets = null;
     int start = request.getPagingStart();
     int limit = request.getPagingLimit();
-    long startRevision = parseRevision(request.getStartChangeset());
-    long endRevision = parseRevision(request.getEndChangeset());
+    long startRevision = parseRevision(request.getStartChangeset(), repository);
+    long endRevision = parseRevision(request.getEndChangeset(), repository);
     String[] pathArray = null;
 
     if (!Strings.isNullOrEmpty(request.getPath()))
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModificationsCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModificationsCommand.java
index e6cedc8ebf..00fb1dc5a0 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModificationsCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModificationsCommand.java
@@ -7,11 +7,9 @@ import org.tmatesoft.svn.core.io.SVNRepository;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Modifications;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.SvnUtil;
 import sonia.scm.util.Util;
 
-import java.io.IOException;
 import java.util.Collection;
 
 @Slf4j
@@ -24,11 +22,11 @@ public class SvnModificationsCommand extends AbstractSvnCommand implements Modif
 
   @Override
   @SuppressWarnings("unchecked")
-  public Modifications getModifications(String revision) throws IOException, RevisionNotFoundException {
+  public Modifications getModifications(String revision) {
     Modifications modifications = null;
     log.debug("get modifications {}", revision);
     try {
-      long revisionNumber = SvnUtil.parseRevision(revision);
+      long revisionNumber = SvnUtil.parseRevision(revision, repository);
       SVNRepository repo = open();
       Collection<SVNLogEntry> entries = repo.log(null, null, revisionNumber,
         revisionNumber, true, true);
@@ -42,7 +40,7 @@ public class SvnModificationsCommand extends AbstractSvnCommand implements Modif
   }
 
   @Override
-  public Modifications getModifications(ModificationsCommandRequest request) throws IOException, RevisionNotFoundException {
+  public Modifications getModifications(ModificationsCommandRequest request) {
     return getModifications(request.getRevision());
   }
 
diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java
index c4c658ea7a..d76e4f3e12 100644
--- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java
+++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java
@@ -38,7 +38,6 @@ package sonia.scm.repository.spi;
 import org.junit.Test;
 import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.FileObject;
-import sonia.scm.repository.RevisionNotFoundException;
 
 import java.io.IOException;
 import java.util.List;
@@ -59,7 +58,7 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
 {
 
   @Test
-  public void testBrowse() throws RevisionNotFoundException {
+  public void testBrowse() {
     List<FileObject> foList = getRootFromTip(new BrowseCommandRequest());
 
     FileObject a = getFileObject(foList, "a.txt");
@@ -83,7 +82,7 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
    * @throws IOException
    */
   @Test
-  public void testBrowseSubDirectory() throws RevisionNotFoundException {
+  public void testBrowseSubDirectory() {
     BrowseCommandRequest request = new BrowseCommandRequest();
 
     request.setPath("c");
@@ -130,7 +129,7 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
   }
 
   @Test
-  public void testDisableLastCommit() throws RevisionNotFoundException {
+  public void testDisableLastCommit() {
     BrowseCommandRequest request = new BrowseCommandRequest();
 
     request.setDisableLastCommit(true);
@@ -144,7 +143,7 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
   }
   
   @Test
-  public void testRecursive() throws RevisionNotFoundException {
+  public void testRecursive() {
     BrowseCommandRequest request = new BrowseCommandRequest();
     request.setRecursive(true);
     BrowserResult result = createCommand().getBrowserResult(request);
@@ -203,7 +202,7 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
     return a;
   }
 
-  private List<FileObject> getRootFromTip(BrowseCommandRequest request) throws RevisionNotFoundException {
+  private List<FileObject> getRootFromTip(BrowseCommandRequest request) {
     BrowserResult result = createCommand().getBrowserResult(request);
 
     assertNotNull(result);
diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnCatCommandTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnCatCommandTest.java
index 3980b3e558..e899c63b19 100644
--- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnCatCommandTest.java
+++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnCatCommandTest.java
@@ -32,9 +32,12 @@
 
 package sonia.scm.repository.spi;
 
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.junit.Rule;
 import org.junit.Test;
-import sonia.scm.repository.PathNotFoundException;
-import sonia.scm.repository.RevisionNotFoundException;
+import org.junit.rules.ExpectedException;
+import sonia.scm.NotFoundException;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -46,8 +49,11 @@ import static org.junit.Assert.assertEquals;
 
 public class SvnCatCommandTest extends AbstractSvnCommandTestBase {
 
+  @Rule
+  public final ExpectedException expectedException = ExpectedException.none();
+
   @Test
-  public void testCat() throws PathNotFoundException, RevisionNotFoundException {
+  public void testCat() {
     CatCommandRequest request = new CatCommandRequest();
 
     request.setPath("a.txt");
@@ -56,35 +62,59 @@ public class SvnCatCommandTest extends AbstractSvnCommandTestBase {
   }
 
   @Test
-  public void testSimpleCat() throws PathNotFoundException, RevisionNotFoundException {
+  public void testSimpleCat() {
     CatCommandRequest request = new CatCommandRequest();
 
     request.setPath("c/d.txt");
     assertEquals("d", execute(request));
   }
 
-  @Test(expected = PathNotFoundException.class)
-  public void testUnknownFile() throws PathNotFoundException, RevisionNotFoundException {
+  @Test
+  public void testUnknownFile() {
     CatCommandRequest request = new CatCommandRequest();
 
     request.setPath("unknown");
     request.setRevision("1");
 
-    execute(request);
-  }
+    expectedException.expect(new BaseMatcher<Object>() {
+      @Override
+      public void describeTo(Description description) {
+        description.appendText("expected NotFoundException for path");
+      }
 
-  @Test(expected = RevisionNotFoundException.class)
-  public void testUnknownRevision() throws PathNotFoundException, RevisionNotFoundException {
-    CatCommandRequest request = new CatCommandRequest();
-
-    request.setPath("a.txt");
-    request.setRevision("42");
+      @Override
+      public boolean matches(Object item) {
+        return "Path".equals(((NotFoundException)item).getContext().get(0).getType());
+      }
+    });
 
     execute(request);
   }
 
   @Test
-  public void testSimpleStream() throws IOException, PathNotFoundException, RevisionNotFoundException {
+  public void testUnknownRevision() {
+    CatCommandRequest request = new CatCommandRequest();
+
+    request.setPath("a.txt");
+    request.setRevision("42");
+
+    expectedException.expect(new BaseMatcher<Object>() {
+      @Override
+      public void describeTo(Description description) {
+        description.appendText("expected NotFoundException for revision");
+      }
+
+      @Override
+      public boolean matches(Object item) {
+        return "Revision".equals(((NotFoundException)item).getContext().get(0).getType());
+      }
+    });
+
+    execute(request);
+  }
+
+  @Test
+  public void testSimpleStream() throws IOException {
     CatCommandRequest request = new CatCommandRequest();
     request.setPath("a.txt");
     request.setRevision("1");
@@ -98,7 +128,7 @@ public class SvnCatCommandTest extends AbstractSvnCommandTestBase {
     catResultStream.close();
   }
 
-  private String execute(CatCommandRequest request) throws PathNotFoundException, RevisionNotFoundException {
+  private String execute(CatCommandRequest request) {
     String content = null;
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnLogCommandTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnLogCommandTest.java
index a55138f151..f2511a9ad9 100644
--- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnLogCommandTest.java
+++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnLogCommandTest.java
@@ -38,7 +38,6 @@ import org.junit.Test;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.Modifications;
-import sonia.scm.repository.RevisionNotFoundException;
 
 import java.io.IOException;
 
@@ -57,7 +56,7 @@ public class SvnLogCommandTest extends AbstractSvnCommandTestBase
 {
 
   @Test
-  public void testGetAll() throws RevisionNotFoundException {
+  public void testGetAll() {
     ChangesetPagingResult result =
       createCommand().getChangesets(new LogCommandRequest());
 
@@ -67,7 +66,7 @@ public class SvnLogCommandTest extends AbstractSvnCommandTestBase
   }
 
   @Test
-  public void testGetAllByPath() throws RevisionNotFoundException {
+  public void testGetAllByPath() {
     LogCommandRequest request = new LogCommandRequest();
 
     request.setPath("a.txt");
@@ -83,7 +82,7 @@ public class SvnLogCommandTest extends AbstractSvnCommandTestBase
   }
 
   @Test
-  public void testGetAllWithLimit() throws RevisionNotFoundException {
+  public void testGetAllWithLimit() {
     LogCommandRequest request = new LogCommandRequest();
 
     request.setPagingLimit(2);
@@ -106,7 +105,7 @@ public class SvnLogCommandTest extends AbstractSvnCommandTestBase
   }
 
   @Test
-  public void testGetAllWithPaging() throws RevisionNotFoundException {
+  public void testGetAllWithPaging() {
     LogCommandRequest request = new LogCommandRequest();
 
     request.setPagingStart(1);
@@ -130,7 +129,7 @@ public class SvnLogCommandTest extends AbstractSvnCommandTestBase
   }
 
   @Test
-  public void testGetCommit() throws RevisionNotFoundException, IOException {
+  public void testGetCommit() {
     Changeset c = createCommand().getChangeset("3");
 
     assertNotNull(c);
@@ -151,7 +150,7 @@ public class SvnLogCommandTest extends AbstractSvnCommandTestBase
   }
 
   @Test
-  public void testGetRange() throws RevisionNotFoundException {
+  public void testGetRange() {
     LogCommandRequest request = new LogCommandRequest();
 
     request.setStartChangeset("2");
diff --git a/scm-webapp/src/main/java/sonia/scm/ManagerDaoAdapter.java b/scm-webapp/src/main/java/sonia/scm/ManagerDaoAdapter.java
index 7979eca0e7..4fdd74063e 100644
--- a/scm-webapp/src/main/java/sonia/scm/ManagerDaoAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/ManagerDaoAdapter.java
@@ -30,7 +30,7 @@ public class ManagerDaoAdapter<T extends ModelObject> {
 
       afterUpdate.handle(notModified);
     } else {
-      throw new NotFoundException();
+      throw new NotFoundException(object.getClass(), object.getId());
     }
   }
 
@@ -58,7 +58,7 @@ public class ManagerDaoAdapter<T extends ModelObject> {
       dao.delete(toDelete);
       afterDelete.handle(toDelete);
     } else {
-      throw new NotFoundException();
+      throw new NotFoundException(toDelete.getClass(), toDelete.getId());
     }
   }
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/BrowserStreamingOutput.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/BrowserStreamingOutput.java
index 2c78df627b..d2ce744c19 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/BrowserStreamingOutput.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/BrowserStreamingOutput.java
@@ -2,8 +2,6 @@ package sonia.scm.api.rest.resources;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.repository.PathNotFoundException;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.api.CatCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.util.IOUtil;
@@ -34,18 +32,6 @@ public class BrowserStreamingOutput implements StreamingOutput {
   public void write(OutputStream output) throws IOException {
     try {
       builder.retriveContent(output, path);
-    } catch (PathNotFoundException ex) {
-      if (logger.isWarnEnabled()) {
-        logger.warn("could not find path {}", ex.getPath());
-      }
-
-      throw new WebApplicationException(Response.Status.NOT_FOUND);
-    } catch (RevisionNotFoundException ex) {
-      if (logger.isWarnEnabled()) {
-        logger.warn("could not find revision {}", ex.getRevision());
-      }
-
-      throw new WebApplicationException(Response.Status.NOT_FOUND);
     } finally {
       IOUtil.close(repositoryService);
     }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java
index db29725917..c5ce925797 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java
@@ -37,7 +37,6 @@ package sonia.scm.api.rest.resources;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.api.DiffCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.util.IOUtil;
@@ -95,22 +94,6 @@ public class DiffStreamingOutput implements StreamingOutput
     {
       builder.retriveContent(output);
     }
-    catch (RevisionNotFoundException ex)
-    {
-      if (logger.isWarnEnabled())
-      {
-        logger.warn("could not find revision {}", ex.getRevision());
-      }
-
-      throw new WebApplicationException(Response.Status.NOT_FOUND);
-    }
-//    catch (RepositoryException ex)
-//    {
-//      logger.error("could not write content to page", ex);
-//
-//      throw new WebApplicationException(ex,
-//        Response.Status.INTERNAL_SERVER_ERROR);
-//    }
     finally
     {
       IOUtil.close(repositoryService);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
index 8a5ba8b1e3..6bd20688d6 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
@@ -50,6 +50,7 @@ import sonia.scm.NotFoundException;
 import sonia.scm.NotSupportedFeatuerException;
 import sonia.scm.Type;
 import sonia.scm.api.rest.RestActionUploadResult;
+import sonia.scm.api.v2.resources.RepositoryResource;
 import sonia.scm.repository.*;
 import sonia.scm.repository.api.Command;
 import sonia.scm.repository.api.RepositoryService;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
deleted file mode 100644
index 4a9fd9e38f..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
+++ /dev/null
@@ -1,1067 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.api.rest.resources;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.common.base.Strings;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.webcohesion.enunciate.metadata.rs.ResponseCode;
-import com.webcohesion.enunciate.metadata.rs.ResponseHeader;
-import com.webcohesion.enunciate.metadata.rs.StatusCodes;
-import com.webcohesion.enunciate.metadata.rs.TypeHint;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authz.AuthorizationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sonia.scm.NotFoundException;
-import sonia.scm.repository.BlameResult;
-import sonia.scm.repository.Branches;
-import sonia.scm.repository.BrowserResult;
-import sonia.scm.repository.Changeset;
-import sonia.scm.repository.ChangesetPagingResult;
-import sonia.scm.repository.HealthChecker;
-import sonia.scm.repository.Permission;
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryIsNotArchivedException;
-import sonia.scm.repository.RepositoryManager;
-import sonia.scm.repository.RepositoryNotFoundException;
-import sonia.scm.repository.Tags;
-import sonia.scm.repository.api.BlameCommandBuilder;
-import sonia.scm.repository.api.BrowseCommandBuilder;
-import sonia.scm.repository.api.CatCommandBuilder;
-import sonia.scm.repository.api.CommandNotSupportedException;
-import sonia.scm.repository.api.DiffCommandBuilder;
-import sonia.scm.repository.api.DiffFormat;
-import sonia.scm.repository.api.LogCommandBuilder;
-import sonia.scm.repository.api.RepositoryService;
-import sonia.scm.repository.api.RepositoryServiceFactory;
-import sonia.scm.util.AssertUtil;
-import sonia.scm.util.HttpUtil;
-import sonia.scm.util.IOUtil;
-import sonia.scm.util.Util;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.GenericEntity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.StreamingOutput;
-import javax.ws.rs.core.UriInfo;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-
-//~--- JDK imports ------------------------------------------------------------
-
-/**
- * Repository related RESTful Web Service Endpoint.
- * 
- * @author Sebastian Sdorra
- */
-@Singleton
-@Path("repositories")
-public class RepositoryResource extends AbstractManagerResource<Repository>
-{
-
-  /** Field description */
-  public static final String PATH_PART = "repositories";
-
-  /** the logger for RepositoryResource */
-  private static final Logger logger =
-    LoggerFactory.getLogger(RepositoryResource.class);
-
-  //~--- constructors ---------------------------------------------------------
-
-  /**
-   * Constructs ...
-   *
-   *  @param repositoryManager
-   * @param servicefactory
-   * @param healthChecker
-   */
-  @Inject
-  public RepositoryResource(RepositoryManager repositoryManager,
-    RepositoryServiceFactory servicefactory, HealthChecker healthChecker)
-  {
-    super(repositoryManager, Repository.class);
-    this.repositoryManager = repositoryManager;
-    this.servicefactory = servicefactory;
-    this.healthChecker = healthChecker;
-    setDisableCache(false);
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Creates a new repository.<strong>Note:</strong> This method requires admin privileges.
-   *
-   * @param uriInfo current uri informations
-   * @param repository the repository to be created
-   *
-   * @return empty response with location header to the new repository
-   */
-  @POST
-  @StatusCodes({
-    @ResponseCode(code = 201, condition = "success", additionalHeaders = {
-      @ResponseHeader(name = "Location", description = "uri to the new created repository")
-    }),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @Override
-  public Response create(@Context UriInfo uriInfo, Repository repository)
-  {
-    return super.create(uriInfo, repository);
-  }
-
-  /**
-   * Deletes a repository. <strong>Note:</strong> This method requires owner privileges.
-   *
-   * @param id the id of the repository to delete.
-   *
-   * @return
-   */
-  @DELETE
-  @Path("{id}")
-  @StatusCodes({
-    @ResponseCode(code = 204, condition = "delete success"),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no owner privileges"),
-    @ResponseCode(code = 404, condition = "could not find repository"),
-    @ResponseCode(
-      code = 412, 
-      condition = "precondition failed, the repository is not archived, this error occurs only with enabled repository archive"
-    ),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Override
-  public Response delete(@PathParam("id") String id)
-  {
-    Response response;
-    Repository repository = manager.get(id);
-
-    if (repository != null)
-    {
-      preDelete(repository);
-
-      try
-      {
-        manager.delete(repository);
-        response = Response.noContent().build();
-      }
-      catch (RepositoryIsNotArchivedException ex)
-      {
-        logger.warn("non archived repository could not be deleted", ex);
-        response = Response.status(Response.Status.PRECONDITION_FAILED).build();
-      }
-      catch (AuthorizationException ex)
-      {
-        logger.warn("delete not allowed", ex);
-        response = Response.status(Response.Status.FORBIDDEN).build();
-      } catch (NotFoundException e) {
-        // there is nothing to do because delete should be idempotent
-        response = Response.ok().build();
-      }
-//      catch (IOException ex)
-//      {
-//        logger.error("error during delete", ex);
-//        response = Response.serverError().build();
-//      }
-    }
-    else
-    {
-      logger.warn("could not find repository {}", id);
-      response = Response.status(Status.NOT_FOUND).build();
-    }
-
-    return response;
-  }
-
-  /**
-   * Re run repository health checks.
-   *
-   * @param id id of the repository
-   *
-   * @return
-   */
-  @POST
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "re run success"),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no owner privileges"),
-    @ResponseCode(code = 404, condition = "could not find repository"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Path("{id}/healthcheck")
-  public Response runHealthChecks(@PathParam("id") String id)
-  {
-    Response response;
-
-    try
-    {
-      healthChecker.check(id);
-      // TODO should return 204 instead of 200
-      response = Response.ok().build();
-    }
-    catch (RepositoryNotFoundException ex)
-    {
-      logger.warn("could not find repository ".concat(id), ex);
-      response = Response.status(Status.NOT_FOUND).build();
-    } catch (NotFoundException e) {
-      logger.error("error occured during health check", e);
-      response = Response.serverError().build();
-    }
-
-    return response;
-  }
-
-  /**
-   * Modifies the given repository. <strong>Note:</strong> This method requires owner privileges.
-   *
-   * @param id id of the repository to be modified
-   * @param repository repository object to modify
-   *
-   * @return
-   */
-  @PUT
-  @Path("{id}")
-  @StatusCodes({
-    @ResponseCode(code = 204, condition = "update successful"),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no owner privileges"),
-    @ResponseCode(code = 404, condition = "could not find repository"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @Override
-  public Response update(@PathParam("id") String id, Repository repository)
-  {
-    return super.update(id, repository);
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Returns the {@link Repository} with the specified id.
-   *
-   * @param request the current request
-   * @param id the id/name of the user
-   *
-   * @return the {@link Repository} with the specified id
-   */
-  @GET
-  @Path("{id}")
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 404, condition = "not found, no repository with the specified id available"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(Repository.class)
-  @Override
-  public Response get(@Context Request request, @PathParam("id") String id)
-  {
-    return super.get(request, id);
-  }
-
-  /**
-   * Returns all repositories.
-   *
-   * @param request the current request
-   * @param start the start value for paging
-   * @param limit the limit value for paging
-   * @param sortby sort parameter
-   * @param desc sort direction desc or aesc
-   *
-   * @return all repositories
-   */
-  @GET
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(Repository[].class)
-  @Override
-  public Response getAll(@Context Request request, @DefaultValue("0")
-  @QueryParam("start") int start, @DefaultValue("-1")
-  @QueryParam("limit") int limit, @QueryParam("sortby") String sortby,
-    @DefaultValue("false")
-  @QueryParam("desc") boolean desc)
-  {
-    return super.getAll(request, start, limit, sortby, desc);
-  }
-
-  /**
-   * Returns a annotate/blame view for the given path.
-   *
-   * @param id the id of the repository
-   * @param revision the revision of the file
-   * @param path the path of the file
-   *
-   * @return a annotate/blame view for the given path
-   *
-   * @throws IOException
-   */
-  @GET
-  @Path("{id}/blame")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 400, condition = "bad request, the blame feature is not supported by this type of repositories."),
-    @ResponseCode(code = 404, condition = "not found, the repository or the path could not be found"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(BlameResult.class)
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Response getBlame(@PathParam("id") String id,
-    @QueryParam("revision") String revision, @QueryParam("path") String path)
-    throws IOException
-  {
-    Response response = null;
-    RepositoryService service = null;
-
-    try
-    {
-      AssertUtil.assertIsNotNull(path);
-      service = servicefactory.create(id);
-
-      BlameCommandBuilder builder = service.getBlameCommand();
-
-      if (!Strings.isNullOrEmpty(revision))
-      {
-        builder.setRevision(revision);
-      }
-
-      BlameResult blamePagingResult = builder.getBlameResult(path);
-
-      if (blamePagingResult != null)
-      {
-        response = Response.ok(blamePagingResult).build();
-      }
-      else
-      {
-        response = Response.ok().build();
-      }
-    }
-    catch (IllegalStateException ex)
-    {
-      response = Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
-    }
-    catch (RepositoryNotFoundException ex)
-    {
-      response = Response.status(Response.Status.NOT_FOUND).build();
-    }
-    catch (CommandNotSupportedException ex)
-    {
-      response = Response.status(Response.Status.BAD_REQUEST).build();
-    }
-    finally
-    {
-      IOUtil.close(service);
-    }
-
-    return response;
-  }
-
-  /**
-   * Returns all {@link Branches} of a repository.
-   *
-   * @param id the id of the repository
-   *
-   * @return all {@link Branches} of a repository
-   *
-   * @throws IOException
-   *
-   * @since 1.18
-   */
-  @GET
-  @Path("{id}/branches")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 400, condition = "bad request, the branch feature is not supported by this type of repositories."),
-    @ResponseCode(code = 404, condition = "not found, the repository could not be found"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(Branches.class)
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Response getBranches(@PathParam("id") String id)
-    throws IOException
-  {
-    Response response = null;
-    RepositoryService service = null;
-
-    try
-    {
-      service = servicefactory.create(id);
-
-      Branches branches = service.getBranchesCommand().getBranches();
-
-      if (branches != null)
-      {
-        response = Response.ok(branches).build();
-      }
-      else
-      {
-        response = Response.status(Status.NOT_FOUND).build();
-      }
-    }
-    catch (RepositoryNotFoundException ex)
-    {
-      response = Response.status(Response.Status.NOT_FOUND).build();
-    }
-    catch (CommandNotSupportedException ex)
-    {
-      response = Response.status(Response.Status.BAD_REQUEST).build();
-    }
-    finally
-    {
-      IOUtil.close(service);
-    }
-
-    return response;
-  }
-
-  /**
-   * Returns a list of folders and files for the given folder.
-   *
-   * @param id the id of the repository
-   * @param revision the revision of the file
-   * @param path the path of the folder
-   * @param disableLastCommit true disables fetch of last commit message
-   * @param disableSubRepositoryDetection true disables sub repository detection
-   * @param recursive true to enable recursive browsing
-   *
-   * @return a list of folders and files for the given folder
-   *
-   * @throws IOException
-   */
-  @GET
-  @Path("{id}/browse")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 400, condition = "bad request, the browse feature is not supported by this type of repositories."),
-    @ResponseCode(code = 404, condition = "not found, the repository or the path could not be found"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(BrowserResult.class)
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  //J-
-  public Response getBrowserResult(
-    @PathParam("id") String id,
-    @QueryParam("revision") String revision, 
-    @QueryParam("path") String path,
-    @QueryParam("disableLastCommit") @DefaultValue("false") boolean disableLastCommit,
-    @QueryParam("disableSubRepositoryDetection") @DefaultValue("false") boolean disableSubRepositoryDetection,
-    @QueryParam("recursive") @DefaultValue("false") boolean recursive)
-    throws IOException
-  //J+
-  {
-    Response response = null;
-    RepositoryService service = null;
-
-    try
-    {
-      service = servicefactory.create(id);
-
-      BrowseCommandBuilder builder = service.getBrowseCommand();
-
-      if (!Strings.isNullOrEmpty(revision))
-      {
-        builder.setRevision(revision);
-      }
-
-      if (!Strings.isNullOrEmpty(path))
-      {
-        builder.setPath(path);
-      }
-
-      //J-
-      builder.setDisableLastCommit(disableLastCommit)
-             .setDisableSubRepositoryDetection(disableSubRepositoryDetection)
-             .setRecursive(recursive);
-      //J+
-
-      BrowserResult result = builder.getBrowserResult();
-
-      if (result != null)
-      {
-        response = Response.ok(result).build();
-      }
-      else
-      {
-        response = Response.status(Response.Status.NOT_FOUND).build();
-      }
-    }
-    catch (NotFoundException ex)
-    {
-      response = Response.status(Response.Status.NOT_FOUND).build();
-    }
-    catch (CommandNotSupportedException ex)
-    {
-      response = Response.status(Response.Status.BAD_REQUEST).build();
-    }
-    finally
-    {
-      IOUtil.close(service);
-    }
-
-    return response;
-  }
-
-  /**
-   * Returns the {@link Changeset} from the given repository
-   * with the specified revision.
-   *
-   * @param id the id of the repository
-   * @param revision the revision of the changeset
-   *
-   * @return a {@link Changeset} from the given repository
-   *
-   * @throws IOException
-   */
-  @GET
-  @Path("{id}/changeset/{revision}")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 400, condition = "bad request, the changeset feature is not supported by this type of repositories."),
-    @ResponseCode(code = 404, condition = "not found, the repository or the revision could not be found"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(Changeset.class)
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Response getChangeset(@PathParam("id") String id,
-    @PathParam("revision") String revision)
-    throws IOException
-  {
-    Response response = null;
-
-    if (Util.isNotEmpty(id) && Util.isNotEmpty(revision))
-    {
-      RepositoryService service = null;
-
-      try
-      {
-        service = servicefactory.create(id);
-
-        Changeset changeset = service.getLogCommand().getChangeset(revision);
-
-        if (changeset != null)
-        {
-          response = Response.ok(changeset).build();
-        }
-        else
-        {
-          response = Response.status(Status.NOT_FOUND).build();
-        }
-      }
-      catch (NotFoundException ex)
-      {
-        response = Response.status(Response.Status.NOT_FOUND).build();
-      }
-      catch (CommandNotSupportedException ex)
-      {
-        response = Response.status(Response.Status.BAD_REQUEST).build();
-      }
-      finally
-      {
-        IOUtil.close(service);
-      }
-    }
-    else
-    {
-      logger.warn("id or revision is empty");
-      response = Response.status(Status.BAD_REQUEST).build();
-    }
-
-    return response;
-  }
-
-  /**
-   * Returns a list of {@link Changeset} for the given repository.
-   *
-   * @param id the id of the repository
-   * @param path path of a file
-   * @param revision the revision of the file specified by the path parameter
-   * @param branch name of the branch
-   * @param start the start value for paging
-   * @param limit the limit value for paging
-   *
-   * @return a list of {@link Changeset} for the given repository
-   *
-   * @throws IOException
-   */
-  @GET
-  @Path("{id}/changesets")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 400, condition = "bad request, the changeset feature is not supported by this type of repositories."),
-    @ResponseCode(code = 404, condition = "not found, the repository or the path could not be found"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(ChangesetPagingResult.class)
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  //J-
-  public Response getChangesets(
-    @PathParam("id") String id,
-    @QueryParam("path") String path, 
-    @QueryParam("revision") String revision,
-    @QueryParam("branch") String branch,
-    @DefaultValue("0") @QueryParam("start") int start, 
-    @DefaultValue("20") @QueryParam("limit") int limit
-  ) throws IOException
-  //J+
-  {
-    Response response = null;
-    RepositoryService service = null;
-
-    try
-    {
-      ChangesetPagingResult changesets;
-
-      service = servicefactory.create(id);
-
-      LogCommandBuilder builder = service.getLogCommand();
-
-      if (!Strings.isNullOrEmpty(path))
-      {
-        builder.setPath(path);
-      }
-
-      if (!Strings.isNullOrEmpty(revision))
-      {
-        builder.setStartChangeset(revision);
-      }
-
-      if (!Strings.isNullOrEmpty(branch))
-      {
-        builder.setBranch(branch);
-      }
-
-      changesets =
-        builder.setPagingStart(start).setPagingLimit(limit).getChangesets();
-
-      if (changesets != null)
-      {
-        response = Response.ok(changesets).build();
-      }
-      else
-      {
-        response = Response.ok().build();
-      }
-    }
-    catch (NotFoundException ex)
-    {
-      response = Response.status(Response.Status.NOT_FOUND).build();
-    }
-    catch (CommandNotSupportedException ex)
-    {
-      response = Response.status(Response.Status.BAD_REQUEST).build();
-    }
-    finally
-    {
-      IOUtil.close(service);
-    }
-
-    return response;
-  }
-
-  /**
-   * Returns the content of a file.
-   *
-   * @param id the id of the repository
-   * @param revision the revision of the file
-   * @param path path to the file
-   *
-   * @return the content of a file
-   */
-  @GET
-  @Path("{id}/content")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 400, condition = "bad request, the content feature is not supported by this type of repositories."),
-    @ResponseCode(code = 404, condition = "not found, the repository or the path could not be found"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(StreamingOutput.class)
-  @Produces({ MediaType.APPLICATION_OCTET_STREAM })
-  public Response getContent(@PathParam("id") String id,
-    @QueryParam("revision") String revision, @QueryParam("path") String path)
-  {
-    Response response;
-    StreamingOutput output;
-    RepositoryService service;
-
-    try
-    {
-      service = servicefactory.create(id);
-
-      CatCommandBuilder builder = service.getCatCommand();
-
-      if (!Strings.isNullOrEmpty(revision))
-      {
-        builder.setRevision(revision);
-      }
-
-      output = new BrowserStreamingOutput(service, builder, path);
-
-      /**
-       * protection for crlf injection
-       * see https://bitbucket.org/sdorra/scm-manager/issue/320/crlf-injection-vulnerability-in-diff-api
-       */
-      path = HttpUtil.removeCRLFInjectionChars(path);
-
-      String contentDispositionName = getContentDispositionNameFromPath(path);
-
-      response = Response.ok(output).header("Content-Disposition",
-        contentDispositionName).build();
-    }
-    catch (RepositoryNotFoundException ex)
-    {
-      logger.warn("could not find repository browser for respository {}", id);
-      response = Response.status(Response.Status.NOT_FOUND).build();
-    }
-    catch (CommandNotSupportedException ex)
-    {
-      response = Response.status(Response.Status.BAD_REQUEST).build();
-    }
-    catch (Exception ex)
-    {
-      logger.error("could not retrive content", ex);
-      response = createErrorResponse(ex);
-    }
-
-    return response;
-  }
-
-  /**
-   * Returns the modifications of a {@link Changeset}.
-   *
-   * @param id the id of the repository
-   * @param revision the revision of the file
-   * @param path path to the file
-   * @param format
-   *
-   * @return the modifications of a {@link Changeset}
-   *
-   * @throws IOException
-   */
-  @GET
-  @Path("{id}/diff")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 400, condition = "bad request, the diff feature is not supported by this type of repositories."),
-    @ResponseCode(code = 404, condition = "not found, the repository or the path could not be found"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(DiffStreamingOutput.class)
-  @Produces(MediaType.APPLICATION_OCTET_STREAM)
-  public Response getDiff(@PathParam("id") String id,
-    @QueryParam("revision") String revision, @QueryParam("path") String path,
-    @QueryParam("format") DiffFormat format)
-    throws IOException
-  {
-    AssertUtil.assertIsNotEmpty(id);
-    AssertUtil.assertIsNotEmpty(revision);
-
-    /**
-     * check for a crlf injection attack
-     * see https://bitbucket.org/sdorra/scm-manager/issue/320/crlf-injection-vulnerability-in-diff-api
-     */
-    HttpUtil.checkForCRLFInjection(revision);
-
-    RepositoryService service;
-    Response response;
-
-    try
-    {
-      service = servicefactory.create(id);
-
-      DiffCommandBuilder builder = service.getDiffCommand();
-
-      if (!Strings.isNullOrEmpty(revision))
-      {
-        builder.setRevision(revision);
-      }
-
-      if (!Strings.isNullOrEmpty(path))
-      {
-        builder.setPath(path);
-      }
-
-      if (format != null)
-      {
-        builder.setFormat(format);
-      }
-
-      String name = service.getRepository().getName().concat("-").concat(
-                      revision).concat(".diff");
-      String contentDispositionName = getContentDispositionName(name);
-
-      response = Response.ok(new DiffStreamingOutput(service,
-        builder)).header("Content-Disposition", contentDispositionName).build();
-    }
-    catch (RepositoryNotFoundException ex)
-    {
-      response = Response.status(Response.Status.NOT_FOUND).build();
-    }
-    catch (CommandNotSupportedException ex)
-    {
-      response = Response.status(Response.Status.BAD_REQUEST).build();
-    }
-    catch (Exception ex)
-    {
-      logger.error("could not create diff", ex);
-      response = createErrorResponse(ex);
-    }
-
-    return response;
-  }
-
-  /**
-   * Returns all {@link Tags} of a repository.
-   *
-   * @param id the id of the repository
-   *
-   * @return all {@link Tags} of a repository
-   *
-   * @throws IOException
-   *
-   * @since 1.18
-   */
-  @GET
-  @Path("{id}/tags")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 400, condition = "bad request, the tag feature is not supported by this type of repositories."),
-    @ResponseCode(code = 404, condition = "not found, the repository could not be found"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(Tags.class)
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Response getTags(@PathParam("id") String id)
-    throws IOException
-  {
-    Response response = null;
-    RepositoryService service = null;
-
-    try
-    {
-      service = servicefactory.create(id);
-
-      Tags tags = service.getTagsCommand().getTags();
-
-      if (tags != null)
-      {
-        response = Response.ok(tags).build();
-      }
-      else
-      {
-        response = Response.status(Status.NOT_FOUND).build();
-      }
-    }
-    catch (RepositoryNotFoundException ex)
-    {
-      response = Response.status(Response.Status.NOT_FOUND).build();
-    }
-    catch (CommandNotSupportedException ex)
-    {
-      response = Response.status(Response.Status.BAD_REQUEST).build();
-    }
-    finally
-    {
-      IOUtil.close(service);
-    }
-
-    return response;
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param items
-   *
-   * @return
-   */
-  @Override
-  protected GenericEntity<Collection<Repository>> createGenericEntity(
-    Collection<Repository> items)
-  {
-    return new GenericEntity<Collection<Repository>>(items) {}
-    ;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   *
-   * @param repositories
-   * @return
-   */
-  @Override
-  protected Collection<Repository> prepareForReturn(
-    Collection<Repository> repositories)
-  {
-    for (Repository repository : repositories)
-    {
-      prepareForReturn(repository);
-    }
-
-    return repositories;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param repository
-   *
-   * @return
-   */
-  @Override
-  protected Repository prepareForReturn(Repository repository)
-  {
-    if (SecurityUtils.getSubject().isPermitted(
-      "repository:modify:".concat(repository.getId())))
-    {
-      if (repository.getPermissions() == null)
-      {
-        repository.setPermissions(new ArrayList<Permission>());
-      }
-    }
-    else
-    {
-      logger.trace("remove properties and permissions from repository, "
-        + "because the user is not privileged");
-
-      repository.setProperties(null);
-      repository.setPermissions(null);
-      repository.setHealthCheckFailures(null);
-    }
-
-    return repository;
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param item
-   *
-   * @return
-   */
-  @Override
-  protected String getId(Repository item)
-  {
-    return item.getId();
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  protected String getPathPart()
-  {
-    return PATH_PART;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   *
-   * @param name
-   *
-   * @return
-   */
-  private String getContentDispositionName(String name)
-  {
-    return HttpUtil.createContentDispositionAttachmentHeader(name);
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param path
-   *
-   * @return
-   */
-  private String getContentDispositionNameFromPath(String path)
-  {
-    String name = path;
-    int index = path.lastIndexOf('/');
-
-    if (index >= 0)
-    {
-      name = path.substring(index + 1);
-    }
-
-    return getContentDispositionName(name);
-  }
-  
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private final HealthChecker healthChecker;
-
-  /** Field description */
-  private final RepositoryManager repositoryManager;
-
-  /** Field description */
-  private final RepositoryServiceFactory servicefactory;
-}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java
index 5f57d1bcc8..e308aeda25 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java
@@ -5,6 +5,7 @@ import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
 import sonia.scm.NotFoundException;
 import sonia.scm.PageResult;
+import sonia.scm.repository.Branch;
 import sonia.scm.repository.Branches;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
@@ -105,7 +106,7 @@ public class BranchRootResource {
         .stream()
         .anyMatch(branch -> branchName.equals(branch.getName()));
       if (!branchExists){
-        throw new NotFoundException("branch", branchName);
+        throw NotFoundException.notFound(Branch.class, branchName).in(Repository.class, namespace + "/" + name).build();
       }
       Repository repository = repositoryService.getRepository();
       RepositoryPermissions.read(repository).check();
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java
index 8900183f5b..bae521ae4c 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java
@@ -11,8 +11,6 @@ import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.RepositoryPermissions;
-import sonia.scm.repository.RevisionNotFoundException;
-import sonia.scm.repository.api.LogCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.web.VndMediaType;
@@ -56,7 +54,7 @@ public class ChangesetRootResource {
   @Produces(VndMediaType.CHANGESET_COLLECTION)
   @TypeHint(CollectionDto.class)
   public Response getAll(@PathParam("namespace") String namespace, @PathParam("name") String name, @DefaultValue("0") @QueryParam("page") int page,
-                         @DefaultValue("10") @QueryParam("pageSize") int pageSize) throws IOException, RevisionNotFoundException, RepositoryNotFoundException {
+                         @DefaultValue("10") @QueryParam("pageSize") int pageSize) throws IOException {
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
       Repository repository = repositoryService.getRepository();
       RepositoryPermissions.read(repository).check();
@@ -89,7 +87,7 @@ public class ChangesetRootResource {
   @Produces(VndMediaType.CHANGESET)
   @TypeHint(ChangesetDto.class)
   @Path("{id}")
-  public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("id") String id) throws IOException, RevisionNotFoundException, RepositoryNotFoundException {
+  public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("id") String id) throws IOException {
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
       Repository repository = repositoryService.getRepository();
       RepositoryPermissions.read(repository).check();
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java
index dc7c305823..9680a319a5 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java
@@ -6,10 +6,9 @@ import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.PathNotFoundException;
 import sonia.scm.repository.RepositoryNotFoundException;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.util.IOUtil;
@@ -64,8 +63,8 @@ public class ContentResource {
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
       Response.ResponseBuilder responseBuilder = Response.ok(stream);
       return createContentHeader(namespace, name, revision, path, repositoryService, responseBuilder);
-    } catch (RepositoryNotFoundException e) {
-      LOG.debug("path '{}' not found in repository {}/{}", path, namespace, name, e);
+    } catch (NotFoundException e) {
+      LOG.debug(e.getMessage());
       return Response.status(Status.NOT_FOUND).build();
     }
   }
@@ -75,14 +74,8 @@ public class ContentResource {
       try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
         repositoryService.getCatCommand().setRevision(revision).retriveContent(os, path);
         os.close();
-      } catch (RepositoryNotFoundException e) {
-        LOG.debug("repository {}/{} not found", path, namespace, name, e);
-        throw new WebApplicationException(Status.NOT_FOUND);
-      } catch (PathNotFoundException e) {
-        LOG.debug("path '{}' not found in repository {}/{}", path, namespace, name, e);
-        throw new WebApplicationException(Status.NOT_FOUND);
-      } catch (RevisionNotFoundException e) {
-        LOG.debug("revision '{}' not found in repository {}/{}", revision, namespace, name, e);
+      } catch (NotFoundException e) {
+        LOG.debug(e.getMessage());
         throw new WebApplicationException(Status.NOT_FOUND);
       }
     };
@@ -111,8 +104,8 @@ public class ContentResource {
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
       Response.ResponseBuilder responseBuilder = Response.ok();
       return createContentHeader(namespace, name, revision, path, repositoryService, responseBuilder);
-    } catch (RepositoryNotFoundException e) {
-      LOG.debug("path '{}' not found in repository {}/{}", path, namespace, name, e);
+    } catch (NotFoundException e) {
+      LOG.debug(e.getMessage());
       return Response.status(Status.NOT_FOUND).build();
     }
   }
@@ -120,12 +113,6 @@ public class ContentResource {
   private Response createContentHeader(String namespace, String name, String revision, String path, RepositoryService repositoryService, Response.ResponseBuilder responseBuilder) {
     try {
       appendContentHeader(path, getHead(revision, path, repositoryService), responseBuilder);
-    } catch (PathNotFoundException e) {
-      LOG.debug("path '{}' not found in repository {}/{}", path, namespace, name, e);
-      return Response.status(Status.NOT_FOUND).build();
-    } catch (RevisionNotFoundException e) {
-      LOG.debug("revision '{}' not found in repository {}/{}", revision, namespace, name, e);
-      return Response.status(Status.NOT_FOUND).build();
     } catch (IOException e) {
       LOG.info("error reading repository resource {} from {}/{}", path, namespace, name, e);
       return Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
@@ -139,7 +126,7 @@ public class ContentResource {
     contentType.getLanguage().ifPresent(language -> responseBuilder.header("Language", language));
   }
 
-  private byte[] getHead(String revision, String path, RepositoryService repositoryService) throws IOException, PathNotFoundException, RevisionNotFoundException {
+  private byte[] getHead(String revision, String path, RepositoryService repositoryService) throws IOException {
     InputStream stream = repositoryService.getCatCommand().setRevision(revision).getStream(path);
     try {
       byte[] buffer = new byte[HEAD_BUFFER_SIZE];
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
index cb78c961a2..212a993f28 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
@@ -4,7 +4,6 @@ import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.util.HttpUtil;
@@ -15,7 +14,6 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 
@@ -54,13 +52,9 @@ public class DiffRootResource {
     HttpUtil.checkForCRLFInjection(revision);
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
       StreamingOutput responseEntry = output -> {
-        try {
-          repositoryService.getDiffCommand()
-            .setRevision(revision)
-            .retriveContent(output);
-        } catch (RevisionNotFoundException e) {
-          throw new WebApplicationException(Response.Status.NOT_FOUND);
-        }
+        repositoryService.getDiffCommand()
+          .setRevision(revision)
+          .retriveContent(output);
       };
       return Response.ok(responseEntry)
         .header(HEADER_CONTENT_DISPOSITION, HttpUtil.createContentDispositionAttachmentHeader(String.format("%s-%s.diff", name, revision)))
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
new file mode 100644
index 0000000000..8e97eabf8e
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
@@ -0,0 +1,34 @@
+package sonia.scm.api.v2.resources;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Getter;
+import sonia.scm.ContextEntry;
+import sonia.scm.NotFoundException;
+
+import java.util.List;
+
+@Getter
+public class ErrorDto {
+  private final String transactionId;
+  private final String errorCode;
+  private final List<ContextEntry> context;
+  private final String message;
+
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private final String url;
+
+  private ErrorDto(String transactionId, String errorCode, List<ContextEntry> context, String message) {
+    this(transactionId, errorCode, context, message, null);
+  }
+  private ErrorDto(String transactionId, String errorCode, List<ContextEntry> context, String message, String url) {
+    this.transactionId = transactionId;
+    this.errorCode = errorCode;
+    this.context = context;
+    this.message = message;
+    this.url = url;
+  }
+
+  static ErrorDto from(NotFoundException notFoundException) {
+    return new ErrorDto("todo", "todo", notFoundException.getContext(), notFoundException.getMessage());
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java
index e38a6f699a..ae4bcb1064 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java
@@ -11,7 +11,6 @@ import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryNotFoundException;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.web.VndMediaType;
@@ -51,8 +50,6 @@ public class FileHistoryRootResource {
    * @param pageSize  pagination
    * @return all changesets related to the given file starting with the given revision
    * @throws IOException                 on io error
-   * @throws RevisionNotFoundException   on missing revision
-   * @throws RepositoryNotFoundException on missing repository
    */
   @GET
   @Path("{revision}/{path: .*}")
@@ -69,7 +66,7 @@ public class FileHistoryRootResource {
                          @PathParam("revision") String revision,
                          @PathParam("path") String path,
                          @DefaultValue("0") @QueryParam("page") int page,
-                         @DefaultValue("10") @QueryParam("pageSize") int pageSize) throws IOException, RevisionNotFoundException, RepositoryNotFoundException {
+                         @DefaultValue("10") @QueryParam("pageSize") int pageSize) throws IOException {
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
       log.info("Get changesets of the file {} and revision {}", path, revision);
       Repository repository = repositoryService.getRepository();
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IdResourceManagerAdapter.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IdResourceManagerAdapter.java
index 9fe3d8284d..533bc49da0 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IdResourceManagerAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IdResourceManagerAdapter.java
@@ -5,6 +5,7 @@ import sonia.scm.AlreadyExistsException;
 import sonia.scm.ConcurrentModificationException;
 import sonia.scm.Manager;
 import sonia.scm.ModelObject;
+import sonia.scm.NotFoundException;
 import sonia.scm.PageResult;
 
 import javax.ws.rs.core.Response;
@@ -22,6 +23,7 @@ class IdResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
                              DTO extends HalRepresentation> {
 
   private final Manager<MODEL_OBJECT> manager;
+  private final String type;
 
   private final SingleResourceManagerAdapter<MODEL_OBJECT, DTO> singleAdapter;
   private final CollectionResourceManagerAdapter<MODEL_OBJECT, DTO> collectionAdapter;
@@ -30,6 +32,7 @@ class IdResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
     this.manager = manager;
     singleAdapter = new SingleResourceManagerAdapter<>(manager, type);
     collectionAdapter = new CollectionResourceManagerAdapter<>(manager, type);
+    this.type = type.getSimpleName();
   }
 
   Response get(String id, Function<MODEL_OBJECT, DTO> mapToDto) {
@@ -56,8 +59,8 @@ class IdResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
     return singleAdapter.delete(id);
   }
 
-  private Supplier<Optional<MODEL_OBJECT>> loadBy(String id) {
-    return () -> Optional.ofNullable(manager.get(id));
+  private Supplier<MODEL_OBJECT> loadBy(String id) {
+    return () -> Optional.ofNullable(manager.get(id)).orElseThrow(() -> new NotFoundException(type, id));
   }
 
   private Predicate<MODEL_OBJECT> idStaysTheSame(String id) {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsRootResource.java
index 28f855f40c..eaf165cda1 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsRootResource.java
@@ -3,11 +3,8 @@ package sonia.scm.api.v2.resources;
 import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
-import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Modifications;
 import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.RepositoryNotFoundException;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.web.VndMediaType;
@@ -46,7 +43,7 @@ public class ModificationsRootResource {
   @Produces(VndMediaType.MODIFICATIONS)
   @TypeHint(ModificationsDto.class)
   @Path("{revision}")
-  public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision) throws IOException, RevisionNotFoundException, RepositoryNotFoundException , InternalRepositoryException {
+  public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision) throws IOException {
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
       Modifications modifications = repositoryService.getModificationsCommand()
         .revision(revision)
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/NotFoundExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/NotFoundExceptionMapper.java
index 04264a7629..05c5eccec3 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/NotFoundExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/NotFoundExceptionMapper.java
@@ -32,18 +32,20 @@ package sonia.scm.api.v2.resources;
 
 
 import sonia.scm.NotFoundException;
-import sonia.scm.api.rest.StatusExceptionMapper;
+import sonia.scm.web.VndMediaType;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
 /**
  * @since 2.0.0
  */
 @Provider
-public class NotFoundExceptionMapper extends StatusExceptionMapper<NotFoundException> {
-
-  public NotFoundExceptionMapper() {
-    super(NotFoundException.class, Response.Status.NOT_FOUND);
+public class NotFoundExceptionMapper implements ExceptionMapper<NotFoundException> {
+  @Override
+  public Response toResponse(NotFoundException exception) {
+    return Response.status(Response.Status.NOT_FOUND).entity(ErrorDto.from(exception)).type(VndMediaType.ERROR_TYPE).build();
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
index b1ea912acf..71f0e03516 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
@@ -109,7 +109,7 @@ public class PermissionRootResource {
         .filter(filterPermission(permissionName))
         .map(permission -> modelToDtoMapper.map(permission, repository))
         .findFirst()
-        .orElseThrow(NotFoundException::new)
+        .orElseThrow(() -> NotFoundException.notFound(Permission.class, namespace).in(Repository.class, namespace + "/" + name).build())
     ).build();
   }
 
@@ -164,7 +164,7 @@ public class PermissionRootResource {
     RepositoryPermissions.permissionWrite(repository).check();
     String extractedPermissionName = getPermissionName(permissionName);
     if (!isPermissionExist(new PermissionDto(extractedPermissionName, isGroupPermission(permissionName)), repository)) {
-      throw new NotFoundException("permission", extractedPermissionName);
+      throw NotFoundException.notFound(Permission.class, namespace).in(Repository.class, namespace + "/" + name).build();
     }
     permission.setGroupPermission(isGroupPermission(permissionName));
     if (!extractedPermissionName.equals(permission.getName())) {
@@ -174,7 +174,7 @@ public class PermissionRootResource {
       .stream()
       .filter(filterPermission(permissionName))
       .findFirst()
-      .orElseThrow(NotFoundException::new);
+      .orElseThrow(() -> NotFoundException.notFound(Permission.class, namespace).in(Repository.class, namespace + "/" + name).build());
     dtoToModelMapper.modify(existingPermission, permission);
     manager.modify(repository);
     log.info("the permission with name: {} is updated.", permissionName);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
index 56bb50d4e6..77df2d8e50 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
@@ -203,8 +203,8 @@ public class RepositoryResource {
     }
   }
 
-  private Supplier<Optional<Repository>> loadBy(String namespace, String name) {
-    return () -> Optional.ofNullable(manager.get(new NamespaceAndName(namespace, name)));
+  private Supplier<Repository> loadBy(String namespace, String name) {
+    return () -> Optional.ofNullable(manager.get(new NamespaceAndName(namespace, name))).orElseThrow(() -> new NotFoundException(Repository.class, namespace + "/" + name));
   }
 
   private Predicate<Repository> nameAndNamespaceStaysTheSame(String namespace, String name) {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
index d484567bf8..334dc72b20 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
@@ -38,7 +38,10 @@ class SingleResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
     this(manager, type, e -> Optional.empty());
   }
 
-  SingleResourceManagerAdapter(Manager<MODEL_OBJECT> manager, Class<MODEL_OBJECT> type, Function<Throwable, Optional<Response>> errorHandler) {
+  SingleResourceManagerAdapter(
+    Manager<MODEL_OBJECT> manager,
+    Class<MODEL_OBJECT> type,
+    Function<Throwable, Optional<Response>> errorHandler) {
     super(manager, type);
     this.errorHandler = errorHandler;
   }
@@ -47,25 +50,16 @@ class SingleResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
    * Reads the model object for the given id, transforms it to a dto and returns a corresponding http response.
    * This handles all corner cases, eg. no matching object for the id or missing privileges.
    */
-  Response get(Supplier<Optional<MODEL_OBJECT>> reader, Function<MODEL_OBJECT, DTO> mapToDto) {
-    return reader.get()
-      .map(mapToDto)
-      .map(Response::ok)
-      .map(Response.ResponseBuilder::build)
-      .orElseThrow(NotFoundException::new);
-  }
-  public Response update(Supplier<Optional<MODEL_OBJECT>> reader, Function<MODEL_OBJECT, MODEL_OBJECT> applyChanges, Predicate<MODEL_OBJECT> hasSameKey, Consumer<MODEL_OBJECT> checker) throws NotFoundException, ConcurrentModificationException {
-    MODEL_OBJECT existingModelObject = reader.get().orElseThrow(NotFoundException::new);
-    checker.accept(existingModelObject);
-    return update(reader,applyChanges,hasSameKey);
+  Response get(Supplier<MODEL_OBJECT> reader, Function<MODEL_OBJECT, DTO> mapToDto) {
+    return Response.ok(mapToDto.apply(reader.get())).build();
   }
 
   /**
    * Update the model object for the given id according to the given function and returns a corresponding http response.
    * This handles all corner cases, eg. no matching object for the id or missing privileges.
    */
-  public Response update(Supplier<Optional<MODEL_OBJECT>> reader, Function<MODEL_OBJECT, MODEL_OBJECT> applyChanges, Predicate<MODEL_OBJECT> hasSameKey) throws NotFoundException, ConcurrentModificationException {
-    MODEL_OBJECT existingModelObject = reader.get().orElseThrow(NotFoundException::new);
+  Response update(Supplier<MODEL_OBJECT> reader, Function<MODEL_OBJECT, MODEL_OBJECT> applyChanges, Predicate<MODEL_OBJECT> hasSameKey) throws ConcurrentModificationException {
+    MODEL_OBJECT existingModelObject = reader.get();
     MODEL_OBJECT changedModelObject = applyChanges.apply(existingModelObject);
     if (!hasSameKey.test(changedModelObject)) {
       return Response.status(BAD_REQUEST).entity("illegal change of id").build();
@@ -81,11 +75,13 @@ class SingleResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
       && (updated.getLastModified() == null || existing.getLastModified() > updated.getLastModified());
   }
 
-  public Response delete(Supplier<Optional<MODEL_OBJECT>> reader) {
-    return reader.get()
-      .map(MODEL_OBJECT::getId)
-      .map(this::delete)
-      .orElse(null);
+  public Response delete(Supplier<MODEL_OBJECT> reader) {
+    try {
+      return delete(reader.get().getId());
+    } catch (NotFoundException e) {
+      // due to idempotency of delete this does not matter here.
+      return null;
+    }
   }
 
   @Override
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java
index e3cf17d3a4..42be4daf89 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java
@@ -1,10 +1,8 @@
 package sonia.scm.api.v2.resources;
 
-import sonia.scm.NotFoundException;
 import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.RepositoryNotFoundException;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.api.BrowseCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
@@ -33,14 +31,14 @@ public class SourceRootResource {
   @GET
   @Produces(VndMediaType.SOURCE)
   @Path("")
-  public Response getAllWithoutRevision(@PathParam("namespace") String namespace, @PathParam("name") String name) throws RevisionNotFoundException, RepositoryNotFoundException, IOException {
+  public Response getAllWithoutRevision(@PathParam("namespace") String namespace, @PathParam("name") String name) throws IOException {
     return getSource(namespace, name, "/", null);
   }
 
   @GET
   @Produces(VndMediaType.SOURCE)
   @Path("{revision}")
-  public Response getAll(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision) throws RevisionNotFoundException, RepositoryNotFoundException, IOException {
+  public Response getAll(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision) throws IOException {
     return getSource(namespace, name, "/", revision);
   }
 
@@ -51,7 +49,7 @@ public class SourceRootResource {
     return getSource(namespace, name, path, revision);
   }
 
-  private Response getSource(String namespace, String repoName, String path, String revision) throws IOException, RevisionNotFoundException, RepositoryNotFoundException {
+  private Response getSource(String namespace, String repoName, String path, String revision) throws IOException {
     NamespaceAndName namespaceAndName = new NamespaceAndName(namespace, repoName);
     try (RepositoryService repositoryService = serviceFactory.create(namespaceAndName)) {
       BrowseCommandBuilder browseCommand = repositoryService.getBrowseCommand();
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagNotFoundException.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagNotFoundException.java
deleted file mode 100644
index b572d20c5b..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagNotFoundException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package sonia.scm.api.v2.resources;
-
-import sonia.scm.NotFoundException;
-
-public class TagNotFoundException extends NotFoundException {
-
-}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java
index b3601f7709..6b4f8b2f96 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java
@@ -3,6 +3,7 @@ package sonia.scm.api.v2.resources;
 import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
+import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryNotFoundException;
@@ -47,7 +48,7 @@ public class TagRootResource {
   })
   @Produces(VndMediaType.TAG_COLLECTION)
   @TypeHint(CollectionDto.class)
-  public Response getAll(@PathParam("namespace") String namespace, @PathParam("name") String name) throws IOException, RepositoryNotFoundException {
+  public Response getAll(@PathParam("namespace") String namespace, @PathParam("name") String name) throws IOException {
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
       Tags tags = getTags(repositoryService);
       if (tags != null && tags.getTags() != null) {
@@ -72,7 +73,7 @@ public class TagRootResource {
   @Produces(VndMediaType.TAG)
   @TypeHint(TagDto.class)
   @Path("{tagName}")
-  public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("tagName") String tagName) throws IOException, RepositoryNotFoundException, TagNotFoundException {
+  public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("tagName") String tagName) throws IOException {
     NamespaceAndName namespaceAndName = new NamespaceAndName(namespace, name);
     try (RepositoryService repositoryService = serviceFactory.create(namespaceAndName)) {
       Tags tags = getTags(repositoryService);
@@ -80,7 +81,7 @@ public class TagRootResource {
         Tag tag = tags.getTags().stream()
           .filter(t -> tagName.equals(t.getName()))
           .findFirst()
-          .orElseThrow(TagNotFoundException::new);
+          .orElseThrow(() -> createNotFoundException(namespace, name, tagName));
         return Response.ok(tagToTagDtoMapper.map(tag, namespaceAndName)).build();
       } else {
         return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
@@ -90,6 +91,10 @@ public class TagRootResource {
     }
   }
 
+  private NotFoundException createNotFoundException(String namespace, String name, String tagName) {
+    return NotFoundException.notFound("Tag", tagName).in("Repository", namespace + "/" + name).build();
+  }
+
   private Tags getTags(RepositoryService repositoryService) throws IOException {
     Repository repository = repositoryService.getRepository();
     RepositoryPermissions.read(repository).check();
diff --git a/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java b/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
index 236c6d0ebc..662d9407ca 100644
--- a/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
@@ -172,7 +172,7 @@ public class DefaultGroupManager extends AbstractGroupManager
 
     if (fresh == null)
     {
-      throw new NotFoundException("group", group.getId());
+      throw new NotFoundException(Group.class, group.getId());
     }
 
     fresh.copyProperties(group);
diff --git a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
index 4efaaa1d1c..0f2f45ff0b 100644
--- a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
@@ -219,7 +219,7 @@ public class DefaultUserManager extends AbstractUserManager
 
     if (fresh == null)
     {
-      throw new NotFoundException();
+      throw new NotFoundException(User.class, user.getName());
     }
 
     fresh.copyProperties(user);
@@ -419,7 +419,7 @@ public class DefaultUserManager extends AbstractUserManager
   public void overwritePassword(String userId, String newPassword) {
     User user = get(userId);
     if (user == null) {
-      throw new NotFoundException();
+      throw new NotFoundException(User.class, userId);
     }
     if (!isTypeDefault(user)) {
       throw new ChangePasswordNotAllowedException(user.getType());
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java
index 3d898119fb..bb7b0e5458 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java
@@ -8,8 +8,8 @@ import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.PathNotFoundException;
 import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.api.CatCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
@@ -59,7 +59,7 @@ public class ContentResourceTest {
 
     // defaults for unknown things
     doThrow(new RepositoryNotFoundException("x")).when(repositoryServiceFactory).create(not(eq(existingNamespaceAndName)));
-    doThrow(new PathNotFoundException("x")).when(catCommand).getStream(any());
+    doThrow(new NotFoundException("Test", "X")).when(catCommand).getStream(any());
   }
 
   @Test
@@ -175,7 +175,7 @@ public class ContentResourceTest {
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
       closed = true;
     }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
index fe22c944c4..406547b951 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
@@ -17,11 +17,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import sonia.scm.NotFoundException;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryNotFoundException;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.api.DiffCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
@@ -62,7 +62,7 @@ public class DiffResourceTest extends RepositoryTestBase {
 
 
   @Before
-  public void prepareEnvironment() throws Exception {
+  public void prepareEnvironment() {
     diffRootResource = new DiffRootResource(serviceFactory);
     super.diffRootResource = Providers.of(diffRootResource);
     dispatcher.getRegistry().addSingletonResource(getRepositoryRootResource());
@@ -108,7 +108,7 @@ public class DiffResourceTest extends RepositoryTestBase {
 
   @Test
   public void shouldGet404OnMissingRepository() throws URISyntaxException, RepositoryNotFoundException {
-    when(serviceFactory.create(any(NamespaceAndName.class))).thenThrow(RepositoryNotFoundException.class);
+    when(serviceFactory.create(any(NamespaceAndName.class))).thenThrow(new NotFoundException("Text", "x"));
     MockHttpRequest request = MockHttpRequest
       .get(DIFF_URL + "revision")
       .accept(VndMediaType.DIFF);
@@ -120,20 +120,22 @@ public class DiffResourceTest extends RepositoryTestBase {
   @Test
   public void shouldGet404OnMissingRevision() throws Exception {
     when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder);
-    when(diffCommandBuilder.retriveContent(any())).thenThrow(RevisionNotFoundException.class);
+    when(diffCommandBuilder.retriveContent(any())).thenThrow(new NotFoundException("Text", "x"));
 
     MockHttpRequest request = MockHttpRequest
       .get(DIFF_URL + "revision")
       .accept(VndMediaType.DIFF);
     MockHttpResponse response = new MockHttpResponse();
+
     dispatcher.invoke(request, response);
+
     assertEquals(404, response.getStatus());
   }
 
   @Test
   public void shouldGet400OnCrlfInjection() throws Exception {
     when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder);
-    when(diffCommandBuilder.retriveContent(any())).thenThrow(RevisionNotFoundException.class);
+    when(diffCommandBuilder.retriveContent(any())).thenThrow(new NotFoundException("Text", "x"));
 
     MockHttpRequest request = MockHttpRequest
       .get(DIFF_URL + "ny%0D%0ASet-cookie:%20Tamper=3079675143472450634")
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
index 934e05d0d1..4f00f9ba5b 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
@@ -18,6 +18,7 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import sonia.scm.NotFoundException;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
@@ -26,7 +27,6 @@ import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryNotFoundException;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.api.LogCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
@@ -79,7 +79,7 @@ public class FileHistoryResourceTest extends RepositoryTestBase {
 
 
   @Before
-  public void prepareEnvironment() throws Exception {
+  public void prepareEnvironment() {
     fileHistoryCollectionToDtoMapper = new FileHistoryCollectionToDtoMapper(changesetToChangesetDtoMapper, resourceLinks);
     fileHistoryRootResource = new FileHistoryRootResource(serviceFactory, fileHistoryCollectionToDtoMapper);
     super.fileHistoryRootResource = Providers.of(fileHistoryRootResource);
@@ -134,7 +134,7 @@ public class FileHistoryResourceTest extends RepositoryTestBase {
 
   @Test
   public void shouldGet404OnMissingRepository() throws URISyntaxException, RepositoryNotFoundException {
-    when(serviceFactory.create(any(NamespaceAndName.class))).thenThrow(RepositoryNotFoundException.class);
+    when(serviceFactory.create(any(NamespaceAndName.class))).thenThrow(new NotFoundException("Text", "x"));
     MockHttpRequest request = MockHttpRequest
       .get(FILE_HISTORY_URL + "revision/a.txt")
       .accept(VndMediaType.CHANGESET_COLLECTION);
@@ -152,7 +152,7 @@ public class FileHistoryResourceTest extends RepositoryTestBase {
     when(logCommandBuilder.setPagingLimit(anyInt())).thenReturn(logCommandBuilder);
     when(logCommandBuilder.setStartChangeset(eq(id))).thenReturn(logCommandBuilder);
     when(logCommandBuilder.setPath(eq(path))).thenReturn(logCommandBuilder);
-    when(logCommandBuilder.getChangesets()).thenThrow(RevisionNotFoundException.class);
+    when(logCommandBuilder.getChangesets()).thenThrow(new NotFoundException("Text", "x"));
 
     MockHttpRequest request = MockHttpRequest
       .get(FILE_HISTORY_URL + id + "/" + path)
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
index c84a74bc92..cca7493162 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
@@ -14,7 +14,6 @@ import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.FileObject;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.RepositoryNotFoundException;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.api.BrowseCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
@@ -69,7 +68,7 @@ public class SourceRootResourceTest extends RepositoryTestBase {
   }
 
   @Test
-  public void shouldReturnSources() throws URISyntaxException, IOException, RevisionNotFoundException {
+  public void shouldReturnSources() throws URISyntaxException, IOException {
     BrowserResult result = createBrowserResult();
     when(browseCommandBuilder.getBrowserResult()).thenReturn(result);
     MockHttpRequest request = MockHttpRequest.get("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/repo/sources");
@@ -83,7 +82,7 @@ public class SourceRootResourceTest extends RepositoryTestBase {
 
   @Test
   public void shouldReturn404IfRepoNotFound() throws URISyntaxException, RepositoryNotFoundException {
-    when(serviceFactory.create(new NamespaceAndName("idont", "exist"))).thenThrow(RepositoryNotFoundException.class);
+    when(serviceFactory.create(new NamespaceAndName("idont", "exist"))).thenThrow(new RepositoryNotFoundException("abc"));
     MockHttpRequest request = MockHttpRequest.get("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "idont/exist/sources");
     MockHttpResponse response = new MockHttpResponse();
 
@@ -92,7 +91,7 @@ public class SourceRootResourceTest extends RepositoryTestBase {
   }
 
   @Test
-  public void shouldGetResultForSingleFile() throws URISyntaxException, IOException, RevisionNotFoundException {
+  public void shouldGetResultForSingleFile() throws URISyntaxException, IOException {
     BrowserResult browserResult = new BrowserResult();
     browserResult.setRevision("revision");
     FileObject fileObject = new FileObject();
@@ -111,7 +110,7 @@ public class SourceRootResourceTest extends RepositoryTestBase {
 
   @Test
   public void shouldGet404ForSingleFileIfRepoNotFound() throws URISyntaxException, RepositoryNotFoundException {
-    when(serviceFactory.create(new NamespaceAndName("idont", "exist"))).thenThrow(RepositoryNotFoundException.class);
+    when(serviceFactory.create(new NamespaceAndName("idont", "exist"))).thenThrow(new RepositoryNotFoundException("abc"));
 
     MockHttpRequest request = MockHttpRequest.get("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "idont/exist/sources/revision/fileabc");
     MockHttpResponse response = new MockHttpResponse();
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
index b363b66bfb..1451498124 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
@@ -185,7 +185,7 @@ public class UserRootResourceTest {
       .content(content.getBytes());
     MockHttpResponse response = new MockHttpResponse();
 
-    doThrow(NotFoundException.class).when(userManager).overwritePassword(any(), any());
+    doThrow(new NotFoundException("Test", "x")).when(userManager).overwritePassword(any(), any());
 
     dispatcher.invoke(request, response);
 
diff --git a/scm-webapp/src/test/java/sonia/scm/web/protocol/HttpProtocolServletTest.java b/scm-webapp/src/test/java/sonia/scm/web/protocol/HttpProtocolServletTest.java
index 077020f60c..c22491d045 100644
--- a/scm-webapp/src/test/java/sonia/scm/web/protocol/HttpProtocolServletTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/web/protocol/HttpProtocolServletTest.java
@@ -63,7 +63,7 @@ public class HttpProtocolServletTest {
     when(userAgentParser.parse(request)).thenReturn(userAgent);
     when(userAgent.isBrowser()).thenReturn(false);
     NamespaceAndName existingRepo = new NamespaceAndName("space", "repo");
-    when(serviceFactory.create(not(eq(existingRepo)))).thenThrow(RepositoryNotFoundException.class);
+    when(serviceFactory.create(not(eq(existingRepo)))).thenThrow(new RepositoryNotFoundException("x"));
     when(serviceFactory.create(existingRepo)).thenReturn(repositoryService);
     when(requestProvider.get()).thenReturn(httpServletRequest);
   }

From 59988d715b11412b1ba8362671d72848a3f76044 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Thu, 18 Oct 2018 15:56:51 +0200
Subject: [PATCH 008/188] Switched to diff2html

---
 scm-ui/package.json                           |    5 +-
 scm-ui/src/repos/containers/RepositoryRoot.js |    8 +-
 scm-ui/src/repos/containers/ScmDiff.js        |   73 +-
 scm-ui/styles/scm.scss                        |    6 +-
 scm-ui/yarn.lock                              | 1361 ++++++++++++++++-
 .../api/v2/resources/DiffRootResource.java    |    2 +
 6 files changed, 1418 insertions(+), 37 deletions(-)

diff --git a/scm-ui/package.json b/scm-ui/package.json
index 09a3e46d4b..8a05cb93f8 100644
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -10,14 +10,13 @@
     "bulma": "^0.7.1",
     "bulma-tooltip": "^2.0.2",
     "classnames": "^2.2.5",
+    "diff2html": "^2.4.0",
     "font-awesome": "^4.7.0",
     "history": "^4.7.2",
     "i18next": "^11.4.0",
     "i18next-browser-languagedetector": "^2.2.2",
     "i18next-fetch-backend": "^0.1.0",
     "moment": "^2.22.2",
-    "react": "^16.5.2",
-    "react-dom": "^16.5.2",
     "node-sass": "^4.9.3",
     "postcss-easy-import": "^3.0.0",
     "react": "^16.4.2",
@@ -55,10 +54,10 @@
     "fetch-mock": "^6.5.0",
     "flow-typed": "^2.5.1",
     "jest": "^23.5.0",
-    "postcss-easy-import": "^3.0.0",
     "node-sass": "^4.9.3",
     "node-sass-chokidar": "^1.3.0",
     "npm-run-all": "^4.1.3",
+    "postcss-easy-import": "^3.0.0",
     "prettier": "^1.13.7",
     "react-router-enzyme-context": "^1.2.0",
     "react-test-renderer": "^16.4.1",
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index 1cf852818c..8a5e157c53 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -113,7 +113,7 @@ class RepositoryRoot extends React.Component<Props> {
               />
               <Route
                 path={`${url}/permissions`}
-                render={props => (
+                render={() => (
                   <Permissions
                     namespace={this.props.repository.namespace}
                     repoName={this.props.repository.name}
@@ -144,9 +144,9 @@ class RepositoryRoot extends React.Component<Props> {
                 path={`${url}/diff`}
                 component={() => (
                   <ScmDiff
-                    namespace={repository.namespace}
-                    name={repository.name}
-                    revision={"db64ca5992ad8e327c7687d49f5297bef7b29893"}
+                    repository={repository}
+                    revision={"2"} // TODO: this is hardcoded only for dev purposes.
+                    sideBySide={false}
                   />
                 )}
               />
diff --git a/scm-ui/src/repos/containers/ScmDiff.js b/scm-ui/src/repos/containers/ScmDiff.js
index 622496f2af..c1f82af512 100644
--- a/scm-ui/src/repos/containers/ScmDiff.js
+++ b/scm-ui/src/repos/containers/ScmDiff.js
@@ -1,50 +1,73 @@
 // @flow
 
 import React from "react";
-import {Diff, Hunk, parseDiff} from "react-diff-view";
-import {apiClient} from "@scm-manager/ui-components";
+import { Diff, Hunk, parseDiff } from "react-diff-view";
+import { apiClient } from "@scm-manager/ui-components";
+import type { Repository } from "@scm-manager/ui-types";
+import { Diff2Html } from "diff2html";
 
 type Props = {
-  namespace: string,
-  name: string,
-  revision: string
+  //TODO: Actually, we want the Changeset here
+  repository: Repository,
+  revision: string,
+  sideBySide: boolean
 };
 
-class ScmDiff extends React.Component<Props> {
+type State = {
+  diff: string,
+  error?: Error
+};
+
+class ScmDiff extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props);
-    this.state = {};
+    this.state = { diff: "" };
   }
 
   componentDidMount() {
-    const {namespace, name, revision} = this.props;
-    const url = `/repositories/${namespace}/${name}/diff/${revision}`;
+    const { repository, revision } = this.props;
+    const { namespace, name } = repository;
+    const url = `/repositories/${namespace}/${name}/diff/${revision}`; //TODO: use HATEOAS link from changeset
     apiClient
       .get(url)
       .then(response => response.text())
-      .then(text => this.setState({diff: text}))
-      .catch(error => this.setState({error}));
+      .then(text => this.setState({ ...this.state, diff: text }))
+      .catch(error => this.setState({ ...this.state, error }));
   }
 
   render() {
-    if (!this.state.diff || this.state.diff === "") {
-      return null;
-    }
-    const files = parseDiff(this.state.diff);
+    const options = {
+      inputFormat: "diff",
+      outputFormat: this.props.sideBySide ? "side-by-side" : "line-by-line",
+      showFiles: true,
+      matching: "lines"
+    };
 
-    const renderFile = ({newPath, oldRevision, newRevision, type, hunks}) => (
-      <div>
-        <div> File: {newPath} </div>
-        <Diff key={oldRevision + '-' + newRevision}  diffType={type} hunks={hunks} viewType="split">
-        </Diff>
-      </div>
-    );
+    const outputHtml = Diff2Html.getPrettyHtml(this.state.diff, options);
 
     return (
-      <div>
-        {files.map(renderFile)}
-      </div>
+      // eslint-disable-next-line react/no-danger
+      <div dangerouslySetInnerHTML={{ __html: outputHtml }} />
     );
+    // if (!this.state.diff) {
+    //   return null;
+    // }
+    //
+    // const files = parseDiff(this.state.diff);
+    //
+    // const renderFile = ({ newPath, oldRevision, newRevision, type, hunks }) => (
+    //   <div>
+    //     <div> File: {newPath} </div>
+    //     <Diff
+    //       key={oldRevision + "-" + newRevision}
+    //       diffType={type}
+    //       hunks={hunks}
+    //       viewType="unified"
+    //     />
+    //   </div>
+    // );
+    //
+    // return <div>{files.map(renderFile)}</div>;
   }
 }
 
diff --git a/scm-ui/styles/scm.scss b/scm-ui/styles/scm.scss
index d2e5381a15..4d306df6ad 100644
--- a/scm-ui/styles/scm.scss
+++ b/scm-ui/styles/scm.scss
@@ -53,7 +53,5 @@ $blue: #33B2E8;
 @import "@fortawesome/fontawesome-free/scss/fontawesome.scss";
 $fa-font-path: "webfonts";
 @import "@fortawesome/fontawesome-free/scss/solid.scss";
-@import "react-diff-view/src/Change";
-@import "react-diff-view/src/Diff";
-@import "react-diff-view/src/Hunk";
-@import "react-diff-view/src/Widget";
+
+@import "diff2html/dist/diff2html";
diff --git a/scm-ui/yarn.lock b/scm-ui/yarn.lock
index b7f094b9b5..6318b3c8b3 100644
--- a/scm-ui/yarn.lock
+++ b/scm-ui/yarn.lock
@@ -5,12 +5,14 @@
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
   dependencies:
     "@babel/highlight" "^7.0.0"
 
 "@babel/core@^7.0.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.2.tgz#f8d2a9ceb6832887329a7b60f9d035791400ba4e"
+  integrity sha512-IFeSSnjXdhDaoysIlev//UzHZbdEmm7D0EIH2qtse9xK7mXEZQpYjs2P00XlP1qYsYvid79p+Zgg6tz1mp6iVw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.1.2"
@@ -30,6 +32,7 @@
 "@babel/generator@^7.0.0", "@babel/generator@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.2.tgz#fde75c072575ce7abbd97322e8fef5bae67e4630"
+  integrity sha512-70A9HWLS/1RHk3Ck8tNHKxOoKQuSKocYgwDN85Pyl/RBduss6AKxUR7RIZ/lzduQMSYfWEM4DDBu6A+XGbkFig==
   dependencies:
     "@babel/types" "^7.1.2"
     jsesc "^2.5.1"
@@ -40,12 +43,14 @@
 "@babel/helper-annotate-as-pure@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
+  integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
+  integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==
   dependencies:
     "@babel/helper-explode-assignable-expression" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -53,6 +58,7 @@
 "@babel/helper-builder-react-jsx@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0.tgz#fa154cb53eb918cf2a9a7ce928e29eb649c5acdb"
+  integrity sha512-ebJ2JM6NAKW0fQEqN8hOLxK84RbRz9OkUhGS/Xd5u56ejMfVbayJ4+LykERZCOUM6faa6Fp3SZNX3fcT16MKHw==
   dependencies:
     "@babel/types" "^7.0.0"
     esutils "^2.0.0"
@@ -60,6 +66,7 @@
 "@babel/helper-call-delegate@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
+  integrity sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.0.0"
     "@babel/traverse" "^7.1.0"
@@ -68,6 +75,7 @@
 "@babel/helper-define-map@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
+  integrity sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -76,6 +84,7 @@
 "@babel/helper-explode-assignable-expression@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
+  integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==
   dependencies:
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -83,6 +92,7 @@
 "@babel/helper-function-name@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
+  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
   dependencies:
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/template" "^7.1.0"
@@ -91,30 +101,35 @@
 "@babel/helper-get-function-arity@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-hoist-variables@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
+  integrity sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-member-expression-to-functions@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f"
+  integrity sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-module-imports@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
+  integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-module-transforms@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.1.0.tgz#470d4f9676d9fad50b324cdcce5fbabbc3da5787"
+  integrity sha512-0JZRd2yhawo79Rcm4w0LwSMILFmFXjugG3yqf+P/UsKsRS1mJCmMwwlHDlMg7Avr9LrvSpp4ZSULO9r8jpCzcw==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
@@ -126,22 +141,26 @@
 "@babel/helper-optimise-call-expression@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
+  integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-plugin-utils@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
+  integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
 
 "@babel/helper-regex@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
+  integrity sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==
   dependencies:
     lodash "^4.17.10"
 
 "@babel/helper-remap-async-to-generator@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
+  integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-wrap-function" "^7.1.0"
@@ -152,6 +171,7 @@
 "@babel/helper-replace-supers@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.1.0.tgz#5fc31de522ec0ef0899dc9b3e7cf6a5dd655f362"
+  integrity sha512-BvcDWYZRWVuDeXTYZWxekQNO5D4kO55aArwZOTFXw6rlLQA8ZaDicJR1sO47h+HrnCiDFiww0fSPV0d713KBGQ==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
@@ -161,6 +181,7 @@
 "@babel/helper-simple-access@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
+  integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==
   dependencies:
     "@babel/template" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -168,12 +189,14 @@
 "@babel/helper-split-export-declaration@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-wrap-function@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz#8cf54e9190706067f016af8f75cb3df829cc8c66"
+  integrity sha512-R6HU3dete+rwsdAfrOzTlE9Mcpk4RjU3aX3gi9grtmugQY0u79X7eogUvfXA5sI81Mfq1cn6AgxihfN33STjJA==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/template" "^7.1.0"
@@ -183,6 +206,7 @@
 "@babel/helpers@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.2.tgz#ab752e8c35ef7d39987df4e8586c63b8846234b5"
+  integrity sha512-Myc3pUE8eswD73aWcartxB16K6CGmHDv9KxOmD2CeOs/FaEAQodr3VYGmlvOmog60vNQ2w8QbatuahepZwrHiA==
   dependencies:
     "@babel/template" "^7.1.2"
     "@babel/traverse" "^7.1.0"
@@ -191,6 +215,7 @@
 "@babel/highlight@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
@@ -199,10 +224,12 @@
 "@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.2.tgz#85c5c47af6d244fab77bce6b9bd830e38c978409"
+  integrity sha512-x5HFsW+E/nQalGMw7hu+fvPqnBeBaIr0lWJ2SG0PPL2j+Pm9lYvCrsZJGIgauPIENx0v10INIyFjmSNUD/gSqQ==
 
 "@babel/plugin-proposal-async-generator-functions@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.1.0.tgz#41c1a702e10081456e23a7b74d891922dd1bb6ce"
+  integrity sha512-Fq803F3Jcxo20MXUSDdmZZXrPe6BWyGcWBPPNB/M7WaUYESKDeKMOGIxEzQOjGSmW/NWb6UaPZrtTB2ekhB/ew==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-remap-async-to-generator" "^7.1.0"
@@ -211,6 +238,7 @@
 "@babel/plugin-proposal-class-properties@^7.0.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.1.0.tgz#9af01856b1241db60ec8838d84691aa0bd1e8df4"
+  integrity sha512-/PCJWN+CKt5v1xcGn4vnuu13QDoV+P7NcICP44BoonAJoPSGwVkgrXihFIQGiEjjPlUDBIw1cM7wYFLARS2/hw==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-member-expression-to-functions" "^7.0.0"
@@ -222,6 +250,7 @@
 "@babel/plugin-proposal-json-strings@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz#3b4d7b5cf51e1f2e70f52351d28d44fc2970d01e"
+  integrity sha512-kfVdUkIAGJIVmHmtS/40i/fg/AGnw/rsZBCaapY5yjeO5RA9m165Xbw9KMOu2nqXP5dTFjEjHdfNdoVcHv133Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.0.0"
@@ -229,6 +258,7 @@
 "@babel/plugin-proposal-object-rest-spread@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz#9a17b547f64d0676b6c9cecd4edf74a82ab85e7e"
+  integrity sha512-14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
@@ -236,6 +266,7 @@
 "@babel/plugin-proposal-optional-catch-binding@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz#b610d928fe551ff7117d42c8bb410eec312a6425"
+  integrity sha512-JPqAvLG1s13B/AuoBjdBYvn38RqW6n1TzrQO839/sIpqLpbnXKacsAgpZHzLD83Sm8SDXMkkrAvEnJ25+0yIpw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
@@ -243,6 +274,7 @@
 "@babel/plugin-proposal-unicode-property-regex@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz#498b39cd72536cd7c4b26177d030226eba08cd33"
+  integrity sha512-tM3icA6GhC3ch2SkmSxv7J/hCWKISzwycub6eGsDrFDgukD4dZ/I+x81XgW0YslS6mzNuQ1Cbzh5osjIMgepPQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -251,54 +283,63 @@
 "@babel/plugin-syntax-async-generators@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz#bf0891dcdbf59558359d0c626fdc9490e20bc13c"
+  integrity sha512-im7ged00ddGKAjcZgewXmp1vxSZQQywuQXe2B1A7kajjZmDeY/ekMPmWr9zJgveSaQH0k7BcGrojQhcK06l0zA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-class-properties@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0.tgz#e051af5d300cbfbcec4a7476e37a803489881634"
+  integrity sha512-cR12g0Qzn4sgkjrbrzWy2GE7m9vMl/sFkqZ3gIpAQdrvPDnLM8180i+ANDFIXfjHo9aqp0ccJlQ0QNZcFUbf9w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-flow@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.0.0.tgz#70638aeaad9ee426bc532e51523cff8ff02f6f17"
+  integrity sha512-zGcuZWiWWDa5qTZ6iAnpG0fnX/GOu49pGR5PFvkQ9GmKNaSphXQnlNXh/LG20sqWtNrx/eB6krzfEzcwvUyeFA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-json-strings@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz#0d259a68090e15b383ce3710e01d5b23f3770cbd"
+  integrity sha512-UlSfNydC+XLj4bw7ijpldc1uZ/HB84vw+U6BTuqMdIEmz/LDe63w/GHtpQMdXWdqQZFeAI9PjnHe/vDhwirhKA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-jsx@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0.tgz#034d5e2b4e14ccaea2e4c137af7e4afb39375ffd"
+  integrity sha512-PdmL2AoPsCLWxhIr3kG2+F9v4WH06Q3z+NoGVpQgnUNGcagXHq5sB3OXxkSahKq9TLdNMN/AJzFYSOo8UKDMHg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-object-rest-spread@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz#37d8fbcaf216bd658ea1aebbeb8b75e88ebc549b"
+  integrity sha512-5A0n4p6bIiVe5OvQPxBnesezsgFJdHhSs3uFSvaPdMqtsovajLZ+G2vZyvNe10EzJBWWo3AcHGKhAFUxqwp2dw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-optional-catch-binding@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz#886f72008b3a8b185977f7cb70713b45e51ee475"
+  integrity sha512-Wc+HVvwjcq5qBg1w5RG9o9RVzmCaAg/Vp0erHCKpAYV8La6I94o4GQAmFYNmkzoMO6gzoOSulpKeSSz6mPEoZw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-arrow-functions@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz#a6c14875848c68a3b4b3163a486535ef25c7e749"
+  integrity sha512-2EZDBl1WIO/q4DIkIp4s86sdp4ZifL51MoIviLY/gG/mLSuOIEg7J8o6mhbxOTvUJkaN50n+8u41FVsr5KLy/w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-async-to-generator@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.1.0.tgz#109e036496c51dd65857e16acab3bafdf3c57811"
+  integrity sha512-rNmcmoQ78IrvNCIt/R9U+cixUHeYAzgusTFgIAv+wQb9HJU4szhpDD6e5GCACmj/JP5KxuCwM96bX3L9v4ZN/g==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -307,12 +348,14 @@
 "@babel/plugin-transform-block-scoped-functions@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz#482b3f75103927e37288b3b67b65f848e2aa0d07"
+  integrity sha512-AOBiyUp7vYTqz2Jibe1UaAWL0Hl9JUXEgjFvvvcSc9MVDItv46ViXFw2F7SVt1B5k+KWjl44eeXOAk3UDEaJjQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-block-scoping@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0.tgz#1745075edffd7cdaf69fab2fb6f9694424b7e9bc"
+  integrity sha512-GWEMCrmHQcYWISilUrk9GDqH4enf3UmhOEbNbNrlNAX1ssH3MsS1xLOS6rdjRVPgA7XXVPn87tRkdTEoA/dxEg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.10"
@@ -320,6 +363,7 @@
 "@babel/plugin-transform-classes@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz#ab3f8a564361800cbc8ab1ca6f21108038432249"
+  integrity sha512-rNaqoD+4OCBZjM7VaskladgqnZ1LO6o2UxuWSDzljzW21pN1KXkB7BstAVweZdxQkHAujps5QMNOTWesBciKFg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-define-map" "^7.1.0"
@@ -333,18 +377,21 @@
 "@babel/plugin-transform-computed-properties@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz#2fbb8900cd3e8258f2a2ede909b90e7556185e31"
+  integrity sha512-ubouZdChNAv4AAWAgU7QKbB93NU5sHwInEWfp+/OzJKA02E6Woh9RVoX4sZrbRwtybky/d7baTUqwFx+HgbvMA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-destructuring@^7.0.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.1.2.tgz#5fa77d473f5a0a3f5266ad7ce2e8c995a164d60a"
+  integrity sha512-cvToXvp/OsYxtEn57XJu9BvsGSEYjAh9UeUuXpoi7x6QHB7YdWyQ4lRU/q0Fu1IJNT0o0u4FQ1DMQBzJ8/8vZg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-dotall-regex@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz#73a24da69bc3c370251f43a3d048198546115e58"
+  integrity sha512-00THs8eJxOJUFVx1w8i1MBF4XH4PsAjKjQ1eqN/uCH3YKwP21GCKfrn6YZFZswbOk9+0cw1zGQPHVc1KBlSxig==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -353,12 +400,14 @@
 "@babel/plugin-transform-duplicate-keys@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz#a0601e580991e7cace080e4cf919cfd58da74e86"
+  integrity sha512-w2vfPkMqRkdxx+C71ATLJG30PpwtTpW7DDdLqYt2acXU7YjztzeWW2Jk1T6hKqCLYCcEA5UQM/+xTAm+QCSnuQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-exponentiation-operator@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.1.0.tgz#9c34c2ee7fd77e02779cfa37e403a2e1003ccc73"
+  integrity sha512-uZt9kD1Pp/JubkukOGQml9tqAeI8NkE98oZnHZ2qHRElmeKCodbTZgOEUtujSCSLhHSBWbzNiFSDIMC4/RBTLQ==
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -366,6 +415,7 @@
 "@babel/plugin-transform-flow-strip-types@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0.tgz#c40ced34c2783985d90d9f9ac77a13e6fb396a01"
+  integrity sha512-WhXUNb4It5a19RsgKKbQPrjmy4yWOY1KynpEbNw7bnd1QTcrT/EIl3MJvnGgpgvrKyKbqX7nUNOJfkpLOnoDKA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-flow" "^7.0.0"
@@ -373,12 +423,14 @@
 "@babel/plugin-transform-for-of@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz#f2ba4eadb83bd17dc3c7e9b30f4707365e1c3e39"
+  integrity sha512-TlxKecN20X2tt2UEr2LNE6aqA0oPeMT1Y3cgz8k4Dn1j5ObT8M3nl9aA37LLklx0PBZKETC9ZAf9n/6SujTuXA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-function-name@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.1.0.tgz#29c5550d5c46208e7f730516d41eeddd4affadbb"
+  integrity sha512-VxOa1TMlFMtqPW2IDYZQaHsFrq/dDoIjgN098NowhexhZcz3UGlvPgZXuE1jEvNygyWyxRacqDpCZt+par1FNg==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -386,12 +438,14 @@
 "@babel/plugin-transform-literals@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz#2aec1d29cdd24c407359c930cdd89e914ee8ff86"
+  integrity sha512-1NTDBWkeNXgpUcyoVFxbr9hS57EpZYXpje92zv0SUzjdu3enaRwF/l3cmyRnXLtIdyJASyiS6PtybK+CgKf7jA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-modules-amd@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.1.0.tgz#f9e0a7072c12e296079b5a59f408ff5b97bf86a8"
+  integrity sha512-wt8P+xQ85rrnGNr2x1iV3DW32W8zrB6ctuBkYBbf5/ZzJY99Ob4MFgsZDFgczNU76iy9PWsy4EuxOliDjdKw6A==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -399,6 +453,7 @@
 "@babel/plugin-transform-modules-commonjs@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.1.0.tgz#0a9d86451cbbfb29bd15186306897c67f6f9a05c"
+  integrity sha512-wtNwtMjn1XGwM0AXPspQgvmE6msSJP15CX2RVfpTSTNPLhKhaOjaIfBaVfj4iUZ/VrFSodcFedwtPg/NxwQlPA==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -407,6 +462,7 @@
 "@babel/plugin-transform-modules-systemjs@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0.tgz#8873d876d4fee23209decc4d1feab8f198cf2df4"
+  integrity sha512-8EDKMAsitLkiF/D4Zhe9CHEE2XLh4bfLbb9/Zf3FgXYQOZyZYyg7EAel/aT2A7bHv62jwHf09q2KU/oEexr83g==
   dependencies:
     "@babel/helper-hoist-variables" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -414,6 +470,7 @@
 "@babel/plugin-transform-modules-umd@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.1.0.tgz#a29a7d85d6f28c3561c33964442257cc6a21f2a8"
+  integrity sha512-enrRtn5TfRhMmbRwm7F8qOj0qEYByqUvTttPEGimcBH4CJHphjyK1Vg7sdU7JjeEmgSpM890IT/efS2nMHwYig==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -421,12 +478,14 @@
 "@babel/plugin-transform-new-target@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
+  integrity sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-object-super@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.1.0.tgz#b1ae194a054b826d8d4ba7ca91486d4ada0f91bb"
+  integrity sha512-/O02Je1CRTSk2SSJaq0xjwQ8hG4zhZGNjE8psTsSNPXyLRCODv7/PBozqT5AmQMzp7MI3ndvMhGdqp9c96tTEw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-replace-supers" "^7.1.0"
@@ -434,6 +493,7 @@
 "@babel/plugin-transform-parameters@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.1.0.tgz#44f492f9d618c9124026e62301c296bf606a7aed"
+  integrity sha512-vHV7oxkEJ8IHxTfRr3hNGzV446GAb+0hgbA7o/0Jd76s+YzccdWuTU296FOCOl/xweU4t/Ya4g41yWz80RFCRw==
   dependencies:
     "@babel/helper-call-delegate" "^7.1.0"
     "@babel/helper-get-function-arity" "^7.0.0"
@@ -442,12 +502,14 @@
 "@babel/plugin-transform-react-display-name@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0.tgz#93759e6c023782e52c2da3b75eca60d4f10533ee"
+  integrity sha512-BX8xKuQTO0HzINxT6j/GiCwoJB0AOMs0HmLbEnAvcte8U8rSkNa/eSCAY+l1OA4JnCVq2jw2p6U8QQryy2fTPg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-react-jsx-self@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.0.0.tgz#a84bb70fea302d915ea81d9809e628266bb0bc11"
+  integrity sha512-pymy+AK12WO4safW1HmBpwagUQRl9cevNX+82AIAtU1pIdugqcH+nuYP03Ja6B+N4gliAaKWAegIBL/ymALPHA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.0.0"
@@ -455,6 +517,7 @@
 "@babel/plugin-transform-react-jsx-source@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0.tgz#28e00584f9598c0dd279f6280eee213fa0121c3c"
+  integrity sha512-OSeEpFJEH5dw/TtxTg4nijl4nHBbhqbKL94Xo/Y17WKIf2qJWeIk/QeXACF19lG1vMezkxqruwnTjVizaW7u7w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.0.0"
@@ -462,6 +525,7 @@
 "@babel/plugin-transform-react-jsx@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0.tgz#524379e4eca5363cd10c4446ba163f093da75f3e"
+  integrity sha512-0TMP21hXsSUjIQJmu/r7RiVxeFrXRcMUigbKu0BLegJK9PkYodHstaszcig7zxXfaBji2LYUdtqIkHs+hgYkJQ==
   dependencies:
     "@babel/helper-builder-react-jsx" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -470,24 +534,28 @@
 "@babel/plugin-transform-regenerator@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1"
+  integrity sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==
   dependencies:
     regenerator-transform "^0.13.3"
 
 "@babel/plugin-transform-shorthand-properties@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz#85f8af592dcc07647541a0350e8c95c7bf419d15"
+  integrity sha512-g/99LI4vm5iOf5r1Gdxq5Xmu91zvjhEG5+yZDJW268AZELAu4J1EiFLnkSG3yuUsZyOipVOVUKoGPYwfsTymhw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-spread@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz#93583ce48dd8c85e53f3a46056c856e4af30b49b"
+  integrity sha512-L702YFy2EvirrR4shTj0g2xQp7aNwZoWNCkNu2mcoU0uyzMl0XRwDSwzB/xp6DSUFiBmEXuyAyEN16LsgVqGGQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-sticky-regex@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz#30a9d64ac2ab46eec087b8530535becd90e73366"
+  integrity sha512-LFUToxiyS/WD+XEWpkx/XJBrUXKewSZpzX68s+yEOtIbdnsRjpryDw9U06gYc6klYEij/+KQVRnD3nz3AoKmjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -495,6 +563,7 @@
 "@babel/plugin-transform-template-literals@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz#084f1952efe5b153ddae69eb8945f882c7a97c65"
+  integrity sha512-vA6rkTCabRZu7Nbl9DfLZE1imj4tzdWcg5vtdQGvj+OH9itNNB6hxuRMHuIY8SGnEt1T9g5foqs9LnrHzsqEFg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -502,12 +571,14 @@
 "@babel/plugin-transform-typeof-symbol@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz#4dcf1e52e943e5267b7313bff347fdbe0f81cec9"
+  integrity sha512-1r1X5DO78WnaAIvs5uC48t41LLckxsYklJrZjNKcevyz83sF2l4RHbw29qrCPr/6ksFsdfRpT/ZgxNWHXRnffg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-unicode-regex@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz#c6780e5b1863a76fe792d90eded9fcd5b51d68fc"
+  integrity sha512-uJBrJhBOEa3D033P95nPHu3nbFwFE9ZgXsfEitzoIXIwqAZWk7uXcg06yFKXz9FSxBH5ucgU/cYdX0IV8ldHKw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -516,6 +587,7 @@
 "@babel/preset-env@^7.0.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.1.0.tgz#e67ea5b0441cfeab1d6f41e9b5c79798800e8d11"
+  integrity sha512-ZLVSynfAoDHB/34A17/JCZbyrzbQj59QC1Anyueb4Bwjh373nVPq5/HMph0z+tCmcDjXDe+DlKQq9ywQuvWrQg==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -562,6 +634,7 @@
 "@babel/preset-flow@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz#afd764835d9535ec63d8c7d4caf1c06457263da2"
+  integrity sha512-bJOHrYOPqJZCkPVbG1Lot2r5OSsB+iUOaxiHdlOeB1yPWS6evswVHwvkDLZ54WTaTRIk89ds0iHmGZSnxlPejQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-flow-strip-types" "^7.0.0"
@@ -569,6 +642,7 @@
 "@babel/preset-react@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"
+  integrity sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-react-display-name" "^7.0.0"
@@ -579,6 +653,7 @@
 "@babel/template@^7.1.0", "@babel/template@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
+  integrity sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.1.2"
@@ -587,6 +662,7 @@
 "@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.0.tgz#503ec6669387efd182c3888c4eec07bcc45d91b2"
+  integrity sha512-bwgln0FsMoxm3pLOgrrnGaXk18sSM9JNf1/nHC/FksmNGFbYnPWY4GYCfLxyP1KRmfsxqkRpfoa6xr6VuuSxdw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.0.0"
@@ -601,6 +677,7 @@
 "@babel/types@^7.0.0", "@babel/types@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.2.tgz#183e7952cf6691628afdc2e2b90d03240bac80c0"
+  integrity sha512-pb1I05sZEKiSlMUV9UReaqsCPUpgbHHHu2n1piRm7JkuBkm6QxcaIzKu6FMnMtCbih/cEYTR+RGYYC96Yk9HAg==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.10"
@@ -609,10 +686,12 @@
 "@fortawesome/fontawesome-free@^5.3.1":
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.3.1.tgz#5466b8f31c1f493a96754c1426c25796d0633dd9"
+  integrity sha512-jt6yi7iZVtkY9Jc6zFo+G2vqL4M81pb3IA3WmnnDt9ci7Asz+mPg4gbZL8pjx0nGFBsG0Bmd7BjU9IQkebqxFA==
 
 "@gulp-sourcemaps/identity-map@1.X":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz#1e6fe5d8027b1f285dc0d31762f566bccd73d5a9"
+  integrity sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==
   dependencies:
     acorn "^5.0.3"
     css "^2.2.1"
@@ -623,6 +702,7 @@
 "@gulp-sourcemaps/map-sources@1.X":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz#890ae7c5d8c877f6d384860215ace9d7ec945bda"
+  integrity sha1-iQrnxdjId/bThIYCFazp1+yUW9o=
   dependencies:
     normalize-path "^2.0.1"
     through2 "^2.0.3"
@@ -630,6 +710,7 @@
 "@octokit/rest@^15.2.6":
   version "15.13.0"
   resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-15.13.0.tgz#078262de2f1d1b02ead7a00c4a3870f517528bcb"
+  integrity sha512-zgsrqMCLcv4XqpT0QGUykHTvKo33aCVzXP86Bq6HmeKuwY6hEWJ+AVCeL/m3bXk1JBpLyBgzjJDfWEfZcqsR6g==
   dependencies:
     before-after-hook "^1.1.0"
     btoa-lite "^1.0.0"
@@ -644,10 +725,12 @@
 "@scm-manager/eslint-config@^0.0.2":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
+  integrity sha512-0Xp8yMaK4RA7nxgF5/Q8hC7ATfwHZLtGogPeEAEHyT+HI5HqWeQpwd+vPuoD1QveoypNDjqDoctmFKdzi26Q+Q==
 
 "@scm-manager/ui-bundler@^0.0.17":
   version "0.0.17"
   resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.17.tgz#949b90ca57e4268be28fcf4975bd9622f60278bb"
+  integrity sha512-k8Hp73HlF+Me3l0ZwmU0SPVadYgYSBL5/bE/9PASO+mdm7dfkjgPIvOPfdXT8GlWwzFt0RIk7ROMf4UEr7Q1ow==
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
@@ -688,6 +771,7 @@
 "@scm-manager/ui-extensions@^0.0.7":
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.0.7.tgz#a0a657a1410b78838ba0b36096ef631dca7fe27e"
+  integrity sha512-iL04lKHn+pfuh0KcOPjAbU9g5Ji0I6P0lOqiwYdVd+U9PjPuJDEjdMC4wNCPc5rMo9tSQdSwqvUtW4e5NjEbfg==
   dependencies:
     react "^16.4.2"
     react-dom "^16.4.2"
@@ -695,10 +779,12 @@
 "@types/node@*":
   version "10.11.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.11.4.tgz#e8bd933c3f78795d580ae41d86590bfc1f4f389d"
+  integrity sha512-ojnbBiKkZFYRfQpmtnnWTMw+rzGp/JiystjluW9jgN3VzRwilXddJ6aGQ9V/7iuDG06SBgn7ozW9k3zcAnYjYQ==
 
 JSONStream@^1.0.3:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
+  integrity sha512-Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -706,14 +792,17 @@ JSONStream@^1.0.3:
 abab@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
+  integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==
 
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 accepts@~1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
   dependencies:
     mime-types "~2.1.18"
     negotiator "0.6.1"
@@ -721,6 +810,7 @@ accepts@~1.3.4:
 acorn-globals@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz#e3b6f8da3c1552a95ae627571f7dd6923bb54103"
+  integrity sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==
   dependencies:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
@@ -728,12 +818,14 @@ acorn-globals@^4.1.0:
 acorn-jsx@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e"
+  integrity sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==
   dependencies:
     acorn "^5.0.3"
 
 acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.6.0.tgz#725c6b8b432451383b5d2816a18a5ab13288aa58"
+  integrity sha512-ZsysjEh+Y3i14f7YXCAKJy99RXbd56wHKYBzN4FlFtICIZyFpYwK6OwNJhcz8A/FMtxoUZkJofH1v9KIfNgWmw==
   dependencies:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
@@ -742,32 +834,39 @@ acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2:
 acorn-walk@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.0.tgz#c957f4a1460da46af4a0388ce28b4c99355b0cbc"
+  integrity sha512-ugTb7Lq7u4GfWSqqpwE0bGyoBZNMTok/zDBXxfEG0QM50jNlGhIWjRC1pPN7bvV1anhF+bs+/gNcRw+o55Evbg==
 
 acorn@5.X, acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.0:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
 acorn@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.2.tgz#6a459041c320ab17592c6317abbfdf4bbaa98ca4"
+  integrity sha512-GXmKIvbrN3TV7aVqAzVFaMW8F8wzVX7voEBRO3bDA64+EX37YSayggRJP5Xig6HYHBkWKpFg9W5gg6orklubhg==
 
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
 agent-base@4, agent-base@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
 ajv-keywords@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
 ajv@^5.1.0, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
@@ -777,6 +876,7 @@ ajv@^5.1.0, ajv@^5.3.0:
 ajv@^6.0.1, ajv@^6.5.3:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
+  integrity sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -786,42 +886,51 @@ ajv@^6.0.1, ajv@^6.5.3:
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
 
 ansi-gray@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
   dependencies:
     ansi-wrap "0.1.0"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-wrap@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
   dependencies:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
@@ -829,6 +938,7 @@ anymatch@^1.3.0:
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
@@ -836,20 +946,24 @@ anymatch@^2.0.0:
 append-transform@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+  integrity sha1-126/jKlNJ24keja61EpLdKthGZE=
   dependencies:
     default-require-extensions "^1.0.0"
 
 aproba@^1.0.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 archy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
 
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -857,12 +971,14 @@ are-we-there-yet@~1.1.2:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 aria-query@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
+  integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=
   dependencies:
     ast-types-flow "0.0.7"
     commander "^2.11.0"
@@ -870,44 +986,54 @@ aria-query@^3.0.0:
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
 
 array-each@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
+  integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
 
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
 array-filter@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
+  integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
 
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
 array-includes@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.7.0"
@@ -915,36 +1041,44 @@ array-includes@^3.0.3:
 array-map@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
+  integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=
 
 array-reduce@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
+  integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
 
 array-slice@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
+  integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
 
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1, array-uniq@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 array.prototype.flat@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz#812db8f02cad24d3fab65dd67eabe3b8903494a4"
+  integrity sha512-rVqIs330nLJvfC7JqYvEWwqVr5QjYF1ib02i3YJtR/fICO6527Tjpc/e4Mvmxh3GIePPreRXMdaGyC99YphWEw==
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.10.0"
@@ -953,14 +1087,17 @@ array.prototype.flat@^1.2.1:
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -969,84 +1106,103 @@ asn1.js@^4.0.0:
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
 
 assert@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
   dependencies:
     util "0.10.3"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 ast-types-flow@0.0.7, ast-types-flow@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
 async-each-series@0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432"
+  integrity sha1-dhfBkXQB/Yykooqtzj266Yr+tDI=
 
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
 
 async-foreach@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
 async@1.5.2:
   version "1.5.2"
   resolved "http://registry.npmjs.org/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
 async@^2.1.4, async@^2.5.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
     lodash "^4.17.10"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
 
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.2.1, aws4@^1.6.0, aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 axios@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"
+  integrity sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0=
   dependencies:
     follow-redirects "^1.2.5"
     is-buffer "^1.1.5"
@@ -1054,12 +1210,14 @@ axios@0.17.1:
 axobject-query@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.1.tgz#05dfa705ada8ad9db993fa6896f22d395b0b0a07"
+  integrity sha1-Bd+nBa2orZ25k/polvItOVsLCgc=
   dependencies:
     ast-types-flow "0.0.7"
 
 babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -1068,6 +1226,7 @@ babel-code-frame@^6.26.0:
 babel-core@^6.0.0, babel-core@^6.26.0:
   version "6.26.3"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+  integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
   dependencies:
     babel-code-frame "^6.26.0"
     babel-generator "^6.26.0"
@@ -1092,10 +1251,12 @@ babel-core@^6.0.0, babel-core@^6.26.0:
 babel-core@^7.0.0-0:
   version "7.0.0-bridge.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
+  integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
 
 babel-eslint@^9.0.0-beta.3:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-9.0.0.tgz#7d9445f81ed9f60aff38115f838970df9f2b6220"
+  integrity sha512-itv1MwE3TMbY0QtNfeL7wzak1mV47Uy+n6HtSOO4Xd7rvmO+tsGQSgyOEEgo6Y2vHZKZphaoelNeSVj4vkLA1g==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.0.0"
@@ -1107,6 +1268,7 @@ babel-eslint@^9.0.0-beta.3:
 babel-generator@^6.18.0, babel-generator@^6.26.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.26.0"
@@ -1120,6 +1282,7 @@ babel-generator@^6.18.0, babel-generator@^6.26.0:
 babel-helpers@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
   dependencies:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
@@ -1127,6 +1290,7 @@ babel-helpers@^6.24.1:
 babel-jest@^23.4.2, babel-jest@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.6.0.tgz#a644232366557a2240a0c083da6b25786185a2f1"
+  integrity sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==
   dependencies:
     babel-plugin-istanbul "^4.1.6"
     babel-preset-jest "^23.2.0"
@@ -1134,12 +1298,14 @@ babel-jest@^23.4.2, babel-jest@^23.6.0:
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-istanbul@^4.1.6:
   version "4.1.6"
   resolved "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
+  integrity sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.13.0"
     find-up "^2.1.0"
@@ -1149,14 +1315,17 @@ babel-plugin-istanbul@^4.1.6:
 babel-plugin-jest-hoist@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
+  integrity sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=
 
 babel-plugin-syntax-object-rest-spread@^6.13.0:
   version "6.13.0"
   resolved "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+  integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
 
 babel-polyfill@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
+  integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
   dependencies:
     babel-runtime "^6.26.0"
     core-js "^2.5.0"
@@ -1165,6 +1334,7 @@ babel-polyfill@^6.26.0:
 babel-preset-jest@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
+  integrity sha1-jsegOhOPABoaj7HoETZSvxpV2kY=
   dependencies:
     babel-plugin-jest-hoist "^23.2.0"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
@@ -1172,6 +1342,7 @@ babel-preset-jest@^23.2.0:
 babel-register@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
   dependencies:
     babel-core "^6.26.0"
     babel-runtime "^6.26.0"
@@ -1184,6 +1355,7 @@ babel-register@^6.26.0:
 babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
@@ -1191,6 +1363,7 @@ babel-runtime@^6.22.0, babel-runtime@^6.26.0:
 babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
   dependencies:
     babel-runtime "^6.26.0"
     babel-traverse "^6.26.0"
@@ -1201,6 +1374,7 @@ babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
 babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
   dependencies:
     babel-code-frame "^6.26.0"
     babel-messages "^6.23.0"
@@ -1215,6 +1389,7 @@ babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.26.0:
 babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
   dependencies:
     babel-runtime "^6.26.0"
     esutils "^2.0.2"
@@ -1224,34 +1399,42 @@ babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.26.0:
 babelify@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/babelify/-/babelify-9.0.0.tgz#6b2e39ffeeda3765aee60eeb5b581fd947cc64ec"
+  integrity sha512-Q8rZxbkCo0BKQFp4JYWSt9lVYWDRyZPk5fsUr4PQguxGDN0XXVjHCr00WaKpdSUhGXSVYjIujXjtFzhwTGg8VA==
 
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@^1.0.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
 base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
+  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -1264,38 +1447,46 @@ base@^0.11.1:
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
 beeper@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
+  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
 
 before-after-hook@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.1.0.tgz#83165e15a59460d13702cb8febd6a1807896db5a"
+  integrity sha512-VOMDtYPwLbIncTxNoSzRyvaMxtXmLWLUqr8k5AfC1BzLk34HvBXaQX8snOwQZ4c0aX8aSERqtJSiI9/m2u5kuA==
 
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
   dependencies:
     callsite "1.0.0"
 
 big-integer@^1.6.17:
   version "1.6.36"
   resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.36.tgz#78631076265d4ae3555c04f85e7d9d2f3a071a36"
+  integrity sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg==
 
 binary-extensions@^1.0.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
+  integrity sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==
 
 binary@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79"
+  integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=
   dependencies:
     buffers "~0.1.1"
     chainsaw "~0.1.0"
@@ -1303,6 +1494,7 @@ binary@~0.3.0:
 bl@^1.2.1:
   version "1.2.2"
   resolved "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
+  integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
   dependencies:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
@@ -1310,38 +1502,46 @@ bl@^1.2.1:
 blob@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
+  integrity sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=
 
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
   dependencies:
     inherits "~2.0.0"
 
 bluebird@^3.3.3:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
+  integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
 
 bluebird@~3.4.1:
   version "3.4.7"
   resolved "http://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
+  integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
 boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 boom@2.x.x:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
   dependencies:
     hoek "2.x.x"
 
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -1349,6 +1549,7 @@ brace-expansion@^1.0.0, brace-expansion@^1.1.7:
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -1357,6 +1558,7 @@ braces@^1.8.2:
 braces@^2.3.0, braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -1372,14 +1574,17 @@ braces@^2.3.0, braces@^2.3.1:
 brcast@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/brcast/-/brcast-3.0.1.tgz#6256a8349b20de9eed44257a9b24d71493cd48dd"
+  integrity sha512-eI3yqf9YEqyGl9PCNTR46MGvDylGtaHjalcz6Q3fAPnP/PhpKkkve52vFdfGpwp4VUvK6LUr4TQN+2stCrEwTg==
 
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
 browser-pack@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.1.0.tgz#c34ba10d0b9ce162b5af227c7131c92c2ecd5774"
+  integrity sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==
   dependencies:
     JSONStream "^1.0.3"
     combine-source-map "~0.8.0"
@@ -1391,16 +1596,19 @@ browser-pack@^6.0.1:
 browser-process-hrtime@^0.1.2:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
+  integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
 
 browser-resolve@^1.11.0, browser-resolve@^1.11.3, browser-resolve@^1.7.0:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
   dependencies:
     resolve "1.1.7"
 
 browser-sync-client@^2.26.0:
   version "2.26.0"
   resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.26.0.tgz#ea8b38a251e8445177e23a0e37b68b1e4eeff0a0"
+  integrity sha512-XRVN6xNFCQYb5mjrDoVzdV2rBK6PMLtTeYkKcs5UPp+/cuviB8z8odaHx0Oe/cAs3Vl45csRdpa7T+q1Zf+6qQ==
   dependencies:
     mitt "^1.1.3"
     rxjs "^5.5.6"
@@ -1408,6 +1616,7 @@ browser-sync-client@^2.26.0:
 browser-sync-ui@^2.26.0:
   version "2.26.0"
   resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.26.0.tgz#8fd7ec972fc30288ca3706df6c3e79ef784710e5"
+  integrity sha512-7bXPmkQ9GuSPUgji3Nb4y0IL8wS2LfdrKSG28bQwvys5bs4kWyXDec2RkYBiupTTModM5lbwXgtmoh7GWQuLGg==
   dependencies:
     async-each-series "0.1.1"
     connect-history-api-fallback "^1"
@@ -1419,6 +1628,7 @@ browser-sync-ui@^2.26.0:
 browser-sync@^2.24.7:
   version "2.26.0"
   resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.26.0.tgz#63b401c51b715e85dc4df9ef1d135a63a6d3889e"
+  integrity sha512-/2f2/jPmFEdPw7wcARid/oGO237RMfZ8SyAYVtF4Zq5R/E+78zx/rH6aFc/UFY+VDHcsCqmDsfIEi/q1fA3l4Q==
   dependencies:
     browser-sync-client "^2.26.0"
     browser-sync-ui "^2.26.0"
@@ -1453,6 +1663,7 @@ browser-sync@^2.24.7:
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -1464,6 +1675,7 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
 browserify-cipher@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
@@ -1472,6 +1684,7 @@ browserify-cipher@^1.0.0:
 browserify-css@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/browserify-css/-/browserify-css-0.14.0.tgz#5ece581aa6f8c9aab262956fd06d57c526c9a334"
+  integrity sha512-FU1vG4kcXpdLwhhLL/VjULBsIdAFV7LbFjTNXoy6yf3omXNObDefZ8RSshUe6v8xwp7QyUENMVIiiOsEfrqvxw==
   dependencies:
     clean-css "^4.1.5"
     concat-stream "^1.6.0"
@@ -1485,6 +1698,7 @@ browserify-css@^0.14.0:
 browserify-des@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -1494,6 +1708,7 @@ browserify-des@^1.0.0:
 browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
@@ -1501,6 +1716,7 @@ browserify-rsa@^4.0.0:
 browserify-sign@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -1513,12 +1729,14 @@ browserify-sign@^4.0.0:
 browserify-zlib@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
     pako "~1.0.5"
 
 browserify@^16.1.0, browserify@^16.2.2:
   version "16.2.3"
   resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.2.3.tgz#7ee6e654ba4f92bce6ab3599c3485b1cc7a0ad0b"
+  integrity sha512-zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ==
   dependencies:
     JSONStream "^1.0.3"
     assert "^1.4.0"
@@ -1572,6 +1790,7 @@ browserify@^16.1.0, browserify@^16.2.2:
 browserslist@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.2.0.tgz#3e5e5edf7fa9758ded0885cf88c1e4be753a591c"
+  integrity sha512-Berls1CHL7qfQz8Lct6QxYA5d2Tvt4doDWHcjvAISybpd+EKZVppNtXgXhaN6SdrPKo7YLTSZuYBs5cYrSWN8w==
   dependencies:
     caniuse-lite "^1.0.30000889"
     electron-to-chromium "^1.3.73"
@@ -1580,40 +1799,49 @@ browserslist@^4.1.0:
 bs-recipes@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585"
+  integrity sha1-DS1NSKcYyMBEdp/cT4lZLci2lYU=
 
 bs-snippet-injector@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/bs-snippet-injector/-/bs-snippet-injector-2.0.1.tgz#61b5393f11f52559ed120693100343b6edb04dd5"
+  integrity sha1-YbU5PxH1JVntEgaTEANDtu2wTdU=
 
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
+  integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=
   dependencies:
     node-int64 "^0.4.0"
 
 btoa-lite@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
+  integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc=
 
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 buffer-indexof-polyfill@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.1.tgz#a9fb806ce8145d5428510ce72f278bb363a638bf"
+  integrity sha1-qfuAbOgUXVQoUQznLyeLs2OmOL8=
 
 buffer-shims@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
+  integrity sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=
 
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^5.0.2:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
+  integrity sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -1621,30 +1849,37 @@ buffer@^5.0.2:
 buffers@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
+  integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s=
 
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 bulma-tooltip@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/bulma-tooltip/-/bulma-tooltip-2.0.2.tgz#cf0bf5ad2dc75492cbcbd4816e1a005314dc90ac"
+  integrity sha512-xsqWeWV7tsUn3uH04SqJeP7/CyC1RaDVIyVzr4/sIO3friIIOi7L6jc5g7qUwDxuBQl72yH/yRPuefpXoQ4hWg==
 
 bulma@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.7.1.tgz#73c2e3b2930c90cc272029cbd19918b493fca486"
+  integrity sha512-wRSO2LXB+qI9Pyz2id+uZr4quz5aftSN7Ay1ysr1+krzVp3utD+Ci4CeKuZdrYGc800t65b7heXBL6qw2Wo/lQ==
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -1659,28 +1894,34 @@ cache-base@^1.0.1:
 cached-path-relative@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
+  integrity sha1-0JxLUoAKpMB44t2BqGmqyQ0uVOc=
 
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
   dependencies:
     callsites "^0.2.0"
 
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
 callsites@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
 
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
@@ -1688,42 +1929,51 @@ camelcase-keys@^2.0.0:
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
 camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 caniuse-lite@^1.0.30000889:
   version "1.0.30000890"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000890.tgz#86a18ffcc65d79ec6a437e985761b8bf1c4efeaf"
+  integrity sha512-4NI3s4Y6ROm+SgZN5sLUG4k7nVWQnedis3c/RWkynV5G6cHSY7+a8fwFyn2yoBDE3E6VswhTNNwR3PvzGqlTkg==
 
 capture-exit@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
   dependencies:
     rsvp "^3.3.3"
 
 caseless@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+  integrity sha1-cVuW6phBWTzDMGeSP17GDr2k99c=
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 chainsaw@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98"
+  integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=
   dependencies:
     traverse ">=0.3.0 <0.4"
 
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -1734,6 +1984,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -1742,14 +1993,17 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1:
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
 charenc@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
 
 cheerio@^1.0.0-rc.2:
   version "1.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
+  integrity sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=
   dependencies:
     css-select "~1.2.0"
     dom-serializer "~0.1.0"
@@ -1761,6 +2015,7 @@ cheerio@^1.0.0-rc.2:
 chokidar@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
   dependencies:
     anymatch "^1.3.0"
     async-each "^1.0.0"
@@ -1776,6 +2031,7 @@ chokidar@^1.0.0:
 chokidar@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
+  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.0"
@@ -1795,14 +2051,17 @@ chokidar@^2.0.4:
 chownr@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
+  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
 
 ci-info@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
+  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -1810,10 +2069,12 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
 circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
+  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
 
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
@@ -1823,26 +2084,31 @@ class-utils@^0.3.5:
 classnames@^2.2.5, classnames@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
+  integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
 
 clean-css@^4.1.5:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
+  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
   dependencies:
     source-map "~0.6.0"
 
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
 cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -1851,6 +2117,7 @@ cliui@^3.2.0:
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -1859,30 +2126,37 @@ cliui@^4.0.0:
 clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
+  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
 
 clone-stats@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
+  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
 
 clone-stats@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
+  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
 
 clone@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
+  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
 
 clone@^1.0.0, clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
 clone@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
 cloneable-readable@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.2.tgz#d591dee4a8f8bc15da43ce97dceeba13d43e2a65"
+  integrity sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==
   dependencies:
     inherits "^2.0.1"
     process-nextick-args "^2.0.0"
@@ -1891,14 +2165,17 @@ cloneable-readable@^1.0.0:
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -1906,28 +2183,34 @@ collection-visit@^1.0.0:
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
 colors@0.5.x:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
+  integrity sha1-fQAj6usVTo7p/Oddy5I9DtFmd3Q=
 
 colors@^1.1.2, colors@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
+  integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
 
 combine-source-map@^0.8.0, combine-source-map@~0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b"
+  integrity sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=
   dependencies:
     convert-source-map "~1.1.0"
     inline-source-map "~0.6.0"
@@ -1937,42 +2220,51 @@ combine-source-map@^0.8.0, combine-source-map@~0.8.0:
 combined-stream@1.0.6:
   version "1.0.6"
   resolved "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
   dependencies:
     delayed-stream "~1.0.0"
 
 combined-stream@^1.0.5, combined-stream@~1.0.5, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
   dependencies:
     delayed-stream "~1.0.0"
 
 commander@^2.11.0, commander@^2.17.1, commander@^2.2.0, commander@^2.9.0:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
+  integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
 
 commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
 
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
     inherits "^2.0.3"
@@ -1982,10 +2274,12 @@ concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0:
 connect-history-api-fallback@^1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
+  integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
 
 connect@3.6.6:
   version "3.6.6"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
+  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
   dependencies:
     debug "2.6.9"
     finalhandler "1.1.0"
@@ -1995,42 +2289,51 @@ connect@3.6.6:
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
   dependencies:
     date-now "^0.1.4"
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 constants-browserify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
 contains-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
 
 convert-source-map@1.X, convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
   dependencies:
     safe-buffer "~5.1.1"
 
 convert-source-map@~1.1.0:
   version "1.1.3"
   resolved "http://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
+  integrity sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=
 
 cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copyfiles@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.1.0.tgz#0e2a4188162d6b2f3c5adfe34e9c0bd564d23164"
+  integrity sha512-cAeDE0vL/koE9WSEGxqPpSyvU638Kgfu6wfrnj7kqp9FWa1CWsU54Coo6sdYZP4GstWa39tL/wIVJWfXcujgNA==
   dependencies:
     glob "^7.0.5"
     minimatch "^3.0.3"
@@ -2042,14 +2345,17 @@ copyfiles@^2.0.0:
 core-js@^2.4.0, core-js@^2.5.0:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
+  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 coveralls@^2.11.3:
   version "2.13.3"
   resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.13.3.tgz#9ad7c2ae527417f361e8b626483f48ee92dd2bc7"
+  integrity sha512-iiAmn+l1XqRwNLXhW8Rs5qHZRFMYp9ZIPjEOVRpC/c4so6Y/f4/lFi0FfR5B9cCqgyhkJ5cZmbvcVRfP8MHchw==
   dependencies:
     js-yaml "3.6.1"
     lcov-parse "0.0.10"
@@ -2060,6 +2366,7 @@ coveralls@^2.11.3:
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -2067,6 +2374,7 @@ create-ecdh@^4.0.0:
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
@@ -2077,6 +2385,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   version "1.1.7"
   resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -2088,6 +2397,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
@@ -2095,6 +2405,7 @@ cross-spawn@^3.0.0:
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
@@ -2103,6 +2414,7 @@ cross-spawn@^5.0.1:
 cross-spawn@^6.0.4, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -2113,16 +2425,19 @@ cross-spawn@^6.0.4, cross-spawn@^6.0.5:
 crypt@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
 
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
   dependencies:
     boom "2.x.x"
 
 crypto-browserify@^3.0.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -2139,6 +2454,7 @@ crypto-browserify@^3.0.0:
 css-select@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
   dependencies:
     boolbase "~1.0.0"
     css-what "2.1"
@@ -2148,16 +2464,19 @@ css-select@~1.2.0:
 css-vendor@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-0.3.8.tgz#6421cfd3034ce664fe7673972fd0119fc28941fa"
+  integrity sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo=
   dependencies:
     is-in-browser "^1.0.2"
 
 css-what@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
+  integrity sha1-lGfQMsOM+u+58teVASUwYvh/ob0=
 
 css@2.X, css@^2.2.1:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
+  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
   dependencies:
     inherits "^2.0.3"
     source-map "^0.6.1"
@@ -2167,38 +2486,45 @@ css@2.X, css@^2.2.1:
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz#8cd52e8a3acfd68d3aed38ee0a640177d2f9d797"
+  integrity sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==
 
 cssstyle@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz#18b038a9c44d65f7a8e428a653b9f6fe42faf5fb"
+  integrity sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog==
   dependencies:
     cssom "0.3.x"
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
   dependencies:
     es5-ext "^0.10.9"
 
 damerau-levenshtein@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
+  integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=
 
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
 data-urls@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.0.1.tgz#d416ac3896918f29ca84d81085bc3705834da579"
+  integrity sha512-0HdcMZzK6ubMUnsMmQmG0AcLQPvbvb47R0+7CCZQCYgcd8OUWG91CG7sM6GoXgjz+WLl4ArFzHtBMy/QqSF4eg==
   dependencies:
     abab "^2.0.0"
     whatwg-mimetype "^2.1.0"
@@ -2207,14 +2533,17 @@ data-urls@^1.0.0:
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
 dateformat@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
+  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
 
 debug-fabulous@1.X:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-1.1.0.tgz#af8a08632465224ef4174a9f06308c3c2a1ebc8e"
+  integrity sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==
   dependencies:
     debug "3.X"
     memoizee "0.4.X"
@@ -2223,86 +2552,102 @@ debug-fabulous@1.X:
 debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
 debug@3.1.0, debug@=3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
 debug@3.X, debug@^3.1.0:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407"
+  integrity sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==
   dependencies:
     ms "^2.1.1"
 
 debug@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.0.1.tgz#f9bb36d439b8d1f0dd52d8fb6b46e4ebb8c1cd5b"
+  integrity sha512-K23FHJ/Mt404FSlp6gSZCevIbTMLX0j3fmHhUEhQ3Wq0FMODW3+cUSoLdy1Gx4polAf4t/lphhmHH35BB8cLYw==
   dependencies:
     ms "^2.1.1"
 
 decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 decompress-response@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
   dependencies:
     mimic-response "^1.0.0"
 
 deep-diff@^0.3.5:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
+  integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=
 
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
 default-require-extensions@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+  integrity sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=
   dependencies:
     strip-bom "^2.0.0"
 
 defaults@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
   dependencies:
     clone "^1.0.2"
 
 define-properties@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
   dependencies:
     object-keys "^1.0.12"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -2310,10 +2655,12 @@ define-property@^2.0.2:
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
 
 del@^2.0.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
   dependencies:
     globby "^5.0.0"
     is-path-cwd "^1.0.0"
@@ -2326,22 +2673,27 @@ del@^2.0.2:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 deprecated@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
+  integrity sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=
 
 deps-sort@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5"
+  integrity sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=
   dependencies:
     JSONStream "^1.0.3"
     shasum "^1.0.0"
@@ -2351,6 +2703,7 @@ deps-sort@^2.0.0:
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -2358,34 +2711,41 @@ des.js@^1.0.0:
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 detect-file@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
+  integrity sha1-STXe39lIhkjgBrASlWbpOGcR6mM=
   dependencies:
     fs-exists-sync "^0.1.0"
 
 detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
   dependencies:
     repeating "^2.0.0"
 
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
 detect-newline@2.X, detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
 
 detective@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/detective/-/detective-5.1.0.tgz#7a20d89236d7b331ccea65832e7123b5551bb7cb"
+  integrity sha512-TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ==
   dependencies:
     acorn-node "^1.3.0"
     defined "^1.0.0"
@@ -2394,14 +2754,27 @@ detective@^5.0.2:
 dev-ip@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
+  integrity sha1-p2o+0YVb56ASu4rBbLgPPADcKPA=
 
-diff@^3.2.0:
+diff2html@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/diff2html/-/diff2html-2.4.0.tgz#de632384eefa5a7f6b0e92eafb1fa25d22dc88ab"
+  integrity sha1-3mMjhO76Wn9rDpLq+x+iXSLciKs=
+  dependencies:
+    diff "^3.5.0"
+    hogan.js "^3.0.2"
+    lodash "^4.17.10"
+    whatwg-fetch "^2.0.4"
+
+diff@^3.2.0, diff@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -2410,10 +2783,12 @@ diffie-hellman@^5.0.0:
 discontinuous-range@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
+  integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
 
 doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
@@ -2421,12 +2796,14 @@ doctrine@1.5.0:
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
   dependencies:
     esutils "^2.0.2"
 
 dom-serializer@0, dom-serializer@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  integrity sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=
   dependencies:
     domelementtype "~1.1.1"
     entities "~1.1.1"
@@ -2434,30 +2811,36 @@ dom-serializer@0, dom-serializer@~0.1.0:
 domain-browser@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+  integrity sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=
 
 domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+  integrity sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=
 
 domexception@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
   dependencies:
     webidl-conversions "^4.0.2"
 
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
   dependencies:
     domelementtype "1"
 
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -2465,6 +2848,7 @@ domutils@1.5.1:
 domutils@^1.5.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -2472,38 +2856,45 @@ domutils@^1.5.1:
 duplexer2@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
   dependencies:
     readable-stream "~1.1.9"
 
 duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2, duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
   dependencies:
     readable-stream "^2.0.2"
 
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
 duplexer@^0.1.1, duplexer@~0.1.1:
   version "0.1.1"
   resolved "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
 easy-extender@^2.3.4:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/easy-extender/-/easy-extender-2.3.4.tgz#298789b64f9aaba62169c77a2b3b64b4c9589b8f"
+  integrity sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==
   dependencies:
     lodash "^4.17.10"
 
 eazy-logger@^3:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-3.0.2.tgz#a325aa5e53d13a2225889b2ac4113b2b9636f4fc"
+  integrity sha1-oyWqXlPROiIliJsqxBE7K5Y29Pw=
   dependencies:
     tfunk "^3.0.1"
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
@@ -2511,14 +2902,17 @@ ecc-jsbn@~0.1.1:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.73:
   version "1.3.75"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.75.tgz#dd04551739e7371862b0ac7f4ddaa9f3f95b7e68"
+  integrity sha512-nLo03Qpw++8R6BxDZL/B1c8SQvUe/htdgc5LWYHe5YotV2jVvRUMP5AlOmxOsyeOzgMiXrNln2mC05Ixz6vuUQ==
 
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
+  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -2531,20 +2925,24 @@ elliptic@^6.0.0:
 emoji-regex@^6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2"
+  integrity sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ==
 
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 end-of-stream@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
+  integrity sha1-jhdyBsPICDfYVjLouTWd/osvbq8=
   dependencies:
     once "~1.3.0"
 
 engine.io-client@~3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
+  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -2561,6 +2959,7 @@ engine.io-client@~3.2.0:
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
+  integrity sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
@@ -2571,6 +2970,7 @@ engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
 engine.io@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz#54332506f42f2edc71690d2f2a42349359f3bf7d"
+  integrity sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==
   dependencies:
     accepts "~1.3.4"
     base64id "1.0.0"
@@ -2582,10 +2982,12 @@ engine.io@~3.2.0:
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+  integrity sha1-blwtClYhtdra7O+AuQ7ftc13cvA=
 
 enzyme-adapter-react-16@^1.1.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.6.0.tgz#3fca28d3c32f3ff427495380fe2dd51494689073"
+  integrity sha512-ay9eGFpChyUDnjTFMMJHzrb681LF3hPWJLEA7RoLFG9jSWAdAm2V50pGmFV9dYGJgh5HfdiqM+MNvle41Yf/PA==
   dependencies:
     enzyme-adapter-utils "^1.8.0"
     function.prototype.name "^1.1.0"
@@ -2598,6 +3000,7 @@ enzyme-adapter-react-16@^1.1.1:
 enzyme-adapter-utils@^1.8.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.8.1.tgz#a927d840ce2c14b42892a533aec836809d4e022b"
+  integrity sha512-s3QB3xQAowaDS2sHhmEqrT13GJC4+n5bG015ZkLv60n9k5vhxxHTQRIneZmQ4hmdCZEBrvUJ89PG6fRI5OEeuQ==
   dependencies:
     function.prototype.name "^1.1.0"
     object.assign "^4.1.0"
@@ -2606,6 +3009,7 @@ enzyme-adapter-utils@^1.8.0:
 enzyme@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.7.0.tgz#9b499e8ca155df44fef64d9f1558961ba1385a46"
+  integrity sha512-QLWx+krGK6iDNyR1KlH5YPZqxZCQaVF6ike1eDJAOg0HvSkSCVImPsdWaNw6v+VrnK92Kg8jIOYhuOSS9sBpyg==
   dependencies:
     array.prototype.flat "^1.2.1"
     cheerio "^1.0.0-rc.2"
@@ -2630,12 +3034,14 @@ enzyme@^3.3.0:
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.10.0, es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.6.1, es-abstract@^1.7.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
+  integrity sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.1"
@@ -2646,6 +3052,7 @@ es-abstract@^1.10.0, es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.5.1,
 es-to-primitive@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
   dependencies:
     is-callable "^1.1.4"
     is-date-object "^1.0.1"
@@ -2654,6 +3061,7 @@ es-to-primitive@^1.1.1:
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
   version "0.10.46"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.46.tgz#efd99f67c5a7ec789baa3daa7f79870388f7f572"
+  integrity sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
@@ -2662,6 +3070,7 @@ es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.9, es5-ext@~
 es6-iterator@^2.0.1, es6-iterator@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
   dependencies:
     d "1"
     es5-ext "^0.10.35"
@@ -2670,16 +3079,19 @@ es6-iterator@^2.0.1, es6-iterator@~2.0.3:
 es6-promise@^4.0.3:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
 
 es6-symbol@^3.1.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -2687,6 +3099,7 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.1:
 es6-weak-map@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  integrity sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=
   dependencies:
     d "1"
     es5-ext "^0.10.14"
@@ -2696,14 +3109,17 @@ es6-weak-map@^2.0.2:
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@^1.9.1:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
+  integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -2715,10 +3131,12 @@ escodegen@^1.9.1:
 eslint-config-react-app@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-2.1.0.tgz#23c909f71cbaff76b945b831d2d814b8bde169eb"
+  integrity sha512-8QZrKWuHVC57Fmu+SsKAVxnI9LycZl7NFQ4H9L+oeISuCXhYdXqsOOIVSjQFW6JF5MXZLFE+21Syhd7mF1IRZQ==
 
 eslint-import-resolver-node@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
+  integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
   dependencies:
     debug "^2.6.9"
     resolve "^1.5.0"
@@ -2726,6 +3144,7 @@ eslint-import-resolver-node@^0.3.1:
 eslint-module-utils@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746"
+  integrity sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=
   dependencies:
     debug "^2.6.8"
     pkg-dir "^1.0.0"
@@ -2733,12 +3152,14 @@ eslint-module-utils@^2.2.0:
 eslint-plugin-flowtype@^2.50.0:
   version "2.50.3"
   resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.50.3.tgz#61379d6dce1d010370acd6681740fd913d68175f"
+  integrity sha512-X+AoKVOr7Re0ko/yEXyM5SSZ0tazc6ffdIOocp2fFUlWoDt7DV0Bz99mngOkAFLOAWjqRA5jPwqUCbrx13XoxQ==
   dependencies:
     lodash "^4.17.10"
 
 eslint-plugin-import@^2.14.0:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8"
+  integrity sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==
   dependencies:
     contains-path "^0.1.0"
     debug "^2.6.8"
@@ -2754,6 +3175,7 @@ eslint-plugin-import@^2.14.0:
 eslint-plugin-jsx-a11y@^6.1.1:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.1.2.tgz#69bca4890b36dcf0fe16dd2129d2d88b98f33f88"
+  integrity sha512-7gSSmwb3A+fQwtw0arguwMdOdzmKUgnUcbSNlo+GjKLAQFuC2EZxWqG9XHRI8VscBJD5a8raz3RuxQNFW+XJbw==
   dependencies:
     aria-query "^3.0.0"
     array-includes "^3.0.3"
@@ -2767,6 +3189,7 @@ eslint-plugin-jsx-a11y@^6.1.1:
 eslint-plugin-react@^7.11.1:
   version "7.11.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz#c01a7af6f17519457d6116aa94fc6d2ccad5443c"
+  integrity sha512-cVVyMadRyW7qsIUh3FHp3u6QHNhOgVrLQYdQEB1bPWBsgbNCHdFAeNMquBMCcZJu59eNthX053L70l7gRt4SCw==
   dependencies:
     array-includes "^3.0.3"
     doctrine "^2.1.0"
@@ -2777,6 +3200,7 @@ eslint-plugin-react@^7.11.1:
 eslint-scope@3.7.1:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
+  integrity sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -2784,6 +3208,7 @@ eslint-scope@3.7.1:
 eslint-scope@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
+  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -2791,14 +3216,17 @@ eslint-scope@^4.0.0:
 eslint-utils@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
+  integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
 
 eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
+  integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
 
 eslint@^5.4.0:
   version "5.6.1"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.6.1.tgz#348134e32ccc09abb2df1bf282b3f6eed8c7b480"
+  integrity sha512-hgrDtGWz368b7Wqf+v1Z69O3ZebNR0+GA7PtDdbmuz4rInFVUV9uw7whjZEiWyLzCjVb5Rs5WRN1TAS6eo7AYA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.5.3"
@@ -2842,6 +3270,7 @@ eslint@^5.4.0:
 espree@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/espree/-/espree-4.0.0.tgz#253998f20a0f82db5d866385799d912a83a36634"
+  integrity sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==
   dependencies:
     acorn "^5.6.0"
     acorn-jsx "^4.1.1"
@@ -2849,42 +3278,51 @@ espree@^4.0.0:
 esprima@^2.6.0:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
 
 esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
+  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
   dependencies:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
   dependencies:
     estraverse "^4.1.0"
 
 estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
 esutils@^2.0.0, esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
 etag@^1.8.1, etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
 event-emitter@^0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -2892,6 +3330,7 @@ event-emitter@^0.3.5:
 event-stream@~3.3.0:
   version "3.3.6"
   resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.6.tgz#cac1230890e07e73ec9cacd038f60a5b66173eef"
+  integrity sha512-dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g==
   dependencies:
     duplexer "^0.1.1"
     flatmap-stream "^0.1.0"
@@ -2905,14 +3344,17 @@ event-stream@~3.3.0:
 eventemitter3@1.x.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
+  integrity sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=
 
 events@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/events/-/events-2.1.0.tgz#2a9a1e18e6106e0e812aa9ebd4a819b3c29c0ba5"
+  integrity sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
@@ -2920,12 +3362,14 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
 exec-sh@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
+  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
   dependencies:
     merge "^1.2.0"
 
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -2938,16 +3382,19 @@ execa@^0.7.0:
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -2960,24 +3407,28 @@ expand-brackets@^2.1.4:
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
   dependencies:
     fill-range "^2.1.0"
 
 expand-tilde@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
+  integrity sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=
   dependencies:
     os-homedir "^1.0.1"
 
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
   dependencies:
     homedir-polyfill "^1.0.1"
 
 expect@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98"
+  integrity sha512-dgSoOHgmtn/aDGRVFWclQyPDKl2CQRq0hmIEoUAuQs/2rn2NcvCWcSCovm6BLeuB/7EZuLGu2QfnR+qRt5OM4w==
   dependencies:
     ansi-styles "^3.2.0"
     jest-diff "^23.6.0"
@@ -2989,12 +3440,14 @@ expect@^23.6.0:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -3002,10 +3455,12 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 extend@^3.0.0, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -3014,12 +3469,14 @@ external-editor@^3.0.0:
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
   dependencies:
     is-extglob "^1.0.0"
 
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -3033,14 +3490,17 @@ extglob@^2.0.4:
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 fancy-log@^1.1.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
+  integrity sha1-9BEl49hPLn2JpD0G2VjI94vha+E=
   dependencies:
     ansi-gray "^0.1.1"
     color-support "^1.1.3"
@@ -3049,34 +3509,41 @@ fancy-log@^1.1.0:
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fast-xml-parser@^3.12.0:
   version "3.12.5"
   resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.12.5.tgz#756e4da382f403f88990a62344add00948820fe0"
+  integrity sha512-g8TSGUF1a2vdFmQ29vKcYBNnwuJQQuyr6It3cjGsiD3dkUXqVWuXZQvjEkgrrCe5K8D30X125ACyxaj7XaaH8g==
   dependencies:
     nimnjs "^1.3.2"
 
 fb-watchman@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
+  integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=
   dependencies:
     bser "^2.0.0"
 
 fetch-mock@^6.5.0:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/fetch-mock/-/fetch-mock-6.5.2.tgz#b3842b305c13ea0f81c85919cfaa7de387adfa3e"
+  integrity sha512-EIvbpCLBTYyDLu4HJiqD7wC8psDwTUaPaWXNKZbhNO/peUYKiNp5PkZGKRJtnTxaPQu71ivqafvjpM7aL+MofQ==
   dependencies:
     babel-polyfill "^6.26.0"
     glob-to-regexp "^0.4.0"
@@ -3085,12 +3552,14 @@ fetch-mock@^6.5.0:
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-entry-cache@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
   dependencies:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
@@ -3098,10 +3567,12 @@ file-entry-cache@^2.0.0:
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
 
 fileset@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
   dependencies:
     glob "^7.0.3"
     minimatch "^3.0.3"
@@ -3109,6 +3580,7 @@ fileset@^2.0.2:
 fill-range@^2.1.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -3119,6 +3591,7 @@ fill-range@^2.1.0:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -3128,6 +3601,7 @@ fill-range@^4.0.0:
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -3140,10 +3614,12 @@ finalhandler@1.1.0:
 find-index@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
+  integrity sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=
 
 find-node-modules@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/find-node-modules/-/find-node-modules-1.0.4.tgz#b6deb3cccb699c87037677bcede2c5f5862b2550"
+  integrity sha1-tt6zzMtpnIcDdne87eLF9YYrJVA=
   dependencies:
     findup-sync "0.4.2"
     merge "^1.2.0"
@@ -3151,6 +3627,7 @@ find-node-modules@^1.0.4:
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
@@ -3158,12 +3635,14 @@ find-up@^1.0.0:
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
 findup-sync@0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.2.tgz#a8117d0f73124f5a4546839579fe52d7129fb5e5"
+  integrity sha1-qBF9D3MST1pFRoOVef5S1xKfteU=
   dependencies:
     detect-file "^0.1.0"
     is-glob "^2.0.1"
@@ -3173,6 +3652,7 @@ findup-sync@0.4.2:
 findup-sync@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
   dependencies:
     detect-file "^1.0.0"
     is-glob "^3.1.0"
@@ -3182,6 +3662,7 @@ findup-sync@^2.0.0:
 fined@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.0.tgz#b37dc844b76a2f5e7081e884f7c0ae344f153476"
+  integrity sha1-s33IRLdqL15wgeiE98CuNE8VNHY=
   dependencies:
     expand-tilde "^2.0.2"
     is-plain-object "^2.0.3"
@@ -3192,14 +3673,17 @@ fined@^1.0.1:
 first-chunk-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
+  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
 
 flagged-respawn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"
+  integrity sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=
 
 flat-cache@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+  integrity sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=
   dependencies:
     circular-json "^0.3.1"
     del "^2.0.2"
@@ -3209,14 +3693,17 @@ flat-cache@^1.2.1:
 flatmap-stream@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/flatmap-stream/-/flatmap-stream-0.1.1.tgz#d34f39ef3b9aa5a2fc225016bd3adf28ac5ae6ea"
+  integrity sha512-lAq4tLbm3sidmdCN8G3ExaxH7cUCtP5mgDvrYowsx84dcYkJJ4I28N7gkxA6+YlSXzaGLJYIDEi9WGfXzMiXdw==
 
 flow-bin@^0.79.1:
   version "0.79.1"
   resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.79.1.tgz#01c9f427baa6556753fa878c192d42e1ecb764b6"
+  integrity sha512-GGetgxz6q9BNqqCQ8wgAGRtyYWXltn++39C6W8HKbS1QC59USfwm3YP3X+eITp7wbkwa+LGlhGfggqeQxOY1vw==
 
 flow-typed@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/flow-typed/-/flow-typed-2.5.1.tgz#0ff565cc94d2af8c557744ba364b6f14726a6b9f"
+  integrity sha1-D/VlzJTSr4xVd0S6NktvFHJqa58=
   dependencies:
     "@octokit/rest" "^15.2.6"
     babel-polyfill "^6.26.0"
@@ -3237,36 +3724,43 @@ flow-typed@^2.5.1:
 follow-redirects@^1.2.5:
   version "1.5.8"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.8.tgz#1dbfe13e45ad969f813e86c00e5296f525c885a1"
+  integrity sha512-sy1mXPmv7kLAMKW/8XofG7o9T+6gAjzdZK4AJF6ryqQYUa/hnzgiypoeUecZ53x7XiqKNEpNqLtS97MshW2nxg==
   dependencies:
     debug "=3.1.0"
 
 font-awesome@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
   dependencies:
     for-in "^1.0.1"
 
 for-own@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
   dependencies:
     for-in "^1.0.1"
 
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  integrity sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.5"
@@ -3275,6 +3769,7 @@ form-data@~2.1.1:
 form-data@~2.3.1, form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "1.0.6"
@@ -3283,24 +3778,29 @@ form-data@~2.3.1, form-data@~2.3.2:
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2, fresh@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
 from@^0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
+  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
 
 fs-exists-sync@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+  integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=
 
 fs-extra@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
+  integrity sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^3.0.0"
@@ -3309,6 +3809,7 @@ fs-extra@3.0.1:
 fs-extra@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
+  integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -3317,16 +3818,19 @@ fs-extra@^5.0.0:
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.0.0, fsevents@^1.2.2, fsevents@^1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
@@ -3334,6 +3838,7 @@ fsevents@^1.0.0, fsevents@^1.2.2, fsevents@^1.2.3:
 fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -3343,10 +3848,12 @@ fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10:
 function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 function.prototype.name@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.0.tgz#8bd763cc0af860a859cc5d49384d74b932cd2327"
+  integrity sha512-Bs0VRrTz4ghD8pTmbJQD1mZ8A/mN0ur/jGz+A6FBxPDUPkm1tNfF6bhTYPA7i7aF4lZJVr+OXTNNrnnIl58Wfg==
   dependencies:
     define-properties "^1.1.2"
     function-bind "^1.1.1"
@@ -3355,10 +3862,12 @@ function.prototype.name@^1.1.0:
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -3372,60 +3881,72 @@ gauge@~2.7.3:
 gaze@^0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f"
+  integrity sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=
   dependencies:
     globule "~0.1.0"
 
 gaze@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
   dependencies:
     globule "^1.0.0"
 
 generate-function@^2.0.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
+  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
   dependencies:
     is-property "^1.0.2"
 
 generate-object-property@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
   dependencies:
     is-property "^1.0.0"
 
 get-assigned-identifiers@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz#6dbf411de648cbaf8d9169ebb0d2d576191e2ff1"
+  integrity sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
 gitdiff-parser@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/gitdiff-parser/-/gitdiff-parser-0.1.2.tgz#26a256e05e9c2d5016b512a96c1dacb40862b92a"
+  integrity sha512-glDM6E1AwLYYTOPyI0CqamNEUSuwwAkmwULWpE2sHMpMZNzGJwErt7+eV+yIZcsbDza0pVSlwlBHFWbTf2Wu7A==
 
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
@@ -3433,12 +3954,14 @@ glob-base@^0.3.0:
 glob-parent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
   dependencies:
     is-glob "^2.0.0"
 
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
@@ -3446,6 +3969,7 @@ glob-parent@^3.1.0:
 glob-stream@^3.1.5:
   version "3.1.18"
   resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
+  integrity sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=
   dependencies:
     glob "^4.3.1"
     glob2base "^0.0.12"
@@ -3457,22 +3981,26 @@ glob-stream@^3.1.5:
 glob-to-regexp@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.0.tgz#49bd677b1671022bd10921c3788f23cdebf9c7e6"
+  integrity sha512-fyPCII4vn9Gvjq2U/oDAfP433aiE64cyP/CJjRJcpVGjqqNdioUYn9+r0cSzT1XPwmGAHuTT7iv+rQT8u/YHKQ==
 
 glob-watcher@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
+  integrity sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=
   dependencies:
     gaze "^0.5.1"
 
 glob2base@^0.0.12:
   version "0.0.12"
   resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
+  integrity sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=
   dependencies:
     find-index "^0.1.1"
 
 glob@^4.3.1:
   version "4.5.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
+  integrity sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -3482,6 +4010,7 @@ glob@^4.3.1:
 glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -3493,6 +4022,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, gl
 glob@~3.1.21:
   version "3.1.21"
   resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
+  integrity sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=
   dependencies:
     graceful-fs "~1.2.0"
     inherits "1"
@@ -3501,6 +4031,7 @@ glob@~3.1.21:
 global-modules@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
+  integrity sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=
   dependencies:
     global-prefix "^0.1.4"
     is-windows "^0.2.0"
@@ -3508,6 +4039,7 @@ global-modules@^0.2.3:
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
   dependencies:
     global-prefix "^1.0.1"
     is-windows "^1.0.1"
@@ -3516,6 +4048,7 @@ global-modules@^1.0.0:
 global-prefix@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
+  integrity sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=
   dependencies:
     homedir-polyfill "^1.0.0"
     ini "^1.3.4"
@@ -3525,6 +4058,7 @@ global-prefix@^0.1.4:
 global-prefix@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
   dependencies:
     expand-tilde "^2.0.2"
     homedir-polyfill "^1.0.1"
@@ -3535,14 +4069,17 @@ global-prefix@^1.0.1:
 globals@^11.1.0, globals@^11.7.0:
   version "11.8.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
+  integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==
 
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
 globby@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
   dependencies:
     array-union "^1.0.1"
     arrify "^1.0.0"
@@ -3554,6 +4091,7 @@ globby@^5.0.0:
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -3564,6 +4102,7 @@ globby@^6.1.0:
 globule@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
+  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
   dependencies:
     glob "~7.1.1"
     lodash "~4.17.10"
@@ -3572,6 +4111,7 @@ globule@^1.0.0:
 globule@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
+  integrity sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=
   dependencies:
     glob "~3.1.21"
     lodash "~1.0.1"
@@ -3580,12 +4120,14 @@ globule@~0.1.0:
 glogg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.1.tgz#dcf758e44789cc3f3d32c1f3562a3676e6a34810"
+  integrity sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==
   dependencies:
     sparkles "^1.0.0"
 
 got@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a"
+  integrity sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==
   dependencies:
     decompress-response "^3.2.0"
     duplexer3 "^0.1.4"
@@ -3605,24 +4147,29 @@ got@^7.1.0:
 graceful-fs@4.X, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
 graceful-fs@^3.0.0:
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
+  integrity sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=
   dependencies:
     natives "^1.1.0"
 
 graceful-fs@~1.2.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
+  integrity sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=
 
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
 gulp-sourcemaps@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-2.6.4.tgz#cbb2008450b1bcce6cd23bf98337be751bf6e30a"
+  integrity sha1-y7IAhFCxvM5s0jv5gze+dRv24wo=
   dependencies:
     "@gulp-sourcemaps/identity-map" "1.X"
     "@gulp-sourcemaps/map-sources" "1.X"
@@ -3639,6 +4186,7 @@ gulp-sourcemaps@^2.6.4:
 gulp-uglify@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/gulp-uglify/-/gulp-uglify-3.0.1.tgz#8d3eee466521bea6b10fd75dff72adf8b7ea2d97"
+  integrity sha512-KVffbGY9d4Wv90bW/B1KZJyunLMyfHTBbilpDvmcrj5Go0/a1G3uVpt+1gRBWSw/11dqR3coJ1oWNTt1AiXuWQ==
   dependencies:
     gulplog "^1.0.0"
     has-gulplog "^0.1.0"
@@ -3652,6 +4200,7 @@ gulp-uglify@^3.0.1:
 gulp-util@^3.0.0:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
+  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
   dependencies:
     array-differ "^1.0.0"
     array-uniq "^1.0.2"
@@ -3675,6 +4224,7 @@ gulp-util@^3.0.0:
 gulp@^3.9.1:
   version "3.9.1"
   resolved "http://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
+  integrity sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=
   dependencies:
     archy "^1.0.0"
     chalk "^1.0.0"
@@ -3693,12 +4243,14 @@ gulp@^3.9.1:
 gulplog@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
+  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
   dependencies:
     glogg "^1.0.0"
 
 handlebars@^4.0.3:
   version "4.0.12"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
   dependencies:
     async "^2.5.0"
     optimist "^0.6.1"
@@ -3709,10 +4261,12 @@ handlebars@^4.0.3:
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+  integrity sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=
   dependencies:
     chalk "^1.1.1"
     commander "^2.9.0"
@@ -3722,6 +4276,7 @@ har-validator@~2.0.6:
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
   dependencies:
     ajv "^5.1.0"
     har-schema "^2.0.0"
@@ -3729,6 +4284,7 @@ har-validator@~5.0.3:
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
   dependencies:
     ajv "^5.3.0"
     har-schema "^2.0.0"
@@ -3736,54 +4292,65 @@ har-validator@~5.1.0:
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-gulplog@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
+  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
   dependencies:
     sparkles "^1.0.0"
 
 has-symbol-support-x@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
+  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
 
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
 
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
+  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
   dependencies:
     has-symbol-support-x "^1.4.1"
 
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -3792,6 +4359,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -3800,10 +4368,12 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -3811,12 +4381,14 @@ has-values@^1.0.0:
 has@^1.0.0, has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -3824,6 +4396,7 @@ hash-base@^3.0.0:
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
+  integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
@@ -3831,6 +4404,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
 hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
   dependencies:
     boom "2.x.x"
     cryptiles "2.x.x"
@@ -3840,6 +4414,7 @@ hawk@~3.1.3:
 history@^4.7.2:
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"
+  integrity sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==
   dependencies:
     invariant "^2.2.1"
     loose-envify "^1.2.0"
@@ -3850,6 +4425,7 @@ history@^4.7.2:
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
@@ -3858,14 +4434,25 @@ hmac-drbg@^1.0.0:
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
+
+hogan.js@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/hogan.js/-/hogan.js-3.0.2.tgz#4cd9e1abd4294146e7679e41d7898732b02c7bfd"
+  integrity sha1-TNnhq9QpQUbnZ55B14mHMrAse/0=
+  dependencies:
+    mkdirp "0.3.0"
+    nopt "1.0.10"
 
 hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
+  integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
 home-or-tmp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
@@ -3873,32 +4460,38 @@ home-or-tmp@^2.0.0:
 homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
+  integrity sha1-TCu8inWJmP7r9e1oWA921GdotLw=
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
 html-encoding-sniffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
   dependencies:
     whatwg-encoding "^1.0.1"
 
 html-parse-stringify2@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/html-parse-stringify2/-/html-parse-stringify2-2.0.1.tgz#dc5670b7292ca158b7bc916c9a6735ac8872834a"
+  integrity sha1-3FZwtyksoVi3vJFsmmc1rIhyg0o=
   dependencies:
     void-elements "^2.0.1"
 
 htmlescape@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
+  integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=
 
 htmlparser2@^3.9.1:
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+  integrity sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=
   dependencies:
     domelementtype "^1.3.0"
     domhandler "^2.3.0"
@@ -3910,6 +4503,7 @@ htmlparser2@^3.9.1:
 http-errors@1.6.3, http-errors@~1.6.2:
   version "1.6.3"
   resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -3919,6 +4513,7 @@ http-errors@1.6.3, http-errors@~1.6.2:
 http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
   dependencies:
     agent-base "4"
     debug "3.1.0"
@@ -3926,6 +4521,7 @@ http-proxy-agent@^2.1.0:
 http-proxy@1.15.2:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.15.2.tgz#642fdcaffe52d3448d2bda3b0079e9409064da31"
+  integrity sha1-ZC/cr/5S00SNK9o7AHnpQJBk2jE=
   dependencies:
     eventemitter3 "1.x.x"
     requires-port "1.x.x"
@@ -3933,6 +4529,7 @@ http-proxy@1.15.2:
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
   dependencies:
     assert-plus "^0.2.0"
     jsprim "^1.2.2"
@@ -3941,6 +4538,7 @@ http-signature@~1.1.0:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -3949,10 +4547,12 @@ http-signature@~1.2.0:
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
@@ -3960,58 +4560,70 @@ https-proxy-agent@^2.2.0:
 hyphenate-style-name@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
+  integrity sha1-MRYKNpMK2vH8BMYHT360FGXU7Es=
 
 i18next-browser-languagedetector@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-2.2.3.tgz#4196a9964b6d51b76254706a267ba746c9ca19de"
+  integrity sha512-sJZ2n9Vgax0vGer23hJMwyO3FRO7P0dq2DXZPXWE329g3snfJUcw+S24Mp3lqJaxL/0McDu4BD75ds6pzIfhhw==
 
 i18next-fetch-backend@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/i18next-fetch-backend/-/i18next-fetch-backend-0.1.0.tgz#18b67920d0e605e616f93bbdf897e59adf9c9c05"
+  integrity sha512-qnas13LdqiX3ViKjP/isoYz/38g5KvlAxmTt0ZQ8Ok/l9cS9pqTqpAf+7xdnvCmiQYzaqAuucEzJAD/qoyVIIQ==
   dependencies:
     i18next-xhr-backend "^1.4.3"
 
 i18next-xhr-backend@^1.4.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/i18next-xhr-backend/-/i18next-xhr-backend-1.5.1.tgz#50282610780c6a696d880dfa7f4ac1d01e8c3ad5"
+  integrity sha512-9OLdC/9YxDvTFcgsH5t2BHCODHEotHCa6h7Ly0EUlUC7Y2GS09UeoHOGj3gWKQ3HCqXz8NlH4gOrK3NNc9vPuw==
 
 i18next@^11.4.0:
   version "11.9.0"
   resolved "https://registry.yarnpkg.com/i18next/-/i18next-11.9.0.tgz#c30c0a5e0a857124923a8dd1ce8f1df603e30c70"
+  integrity sha512-NDuIoELzyJ+29kc29j9aKgzjZht4kEKh3PPdz0qCEC9ZUpgRVaWUdkMRES/NVTcpe1ei4MMwY8DNWBWCIUlAng==
 
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
+  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
 
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
   dependencies:
     minimatch "^3.0.4"
 
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 immutable@^3:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
+  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
 
 import-local@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  integrity sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==
   dependencies:
     pkg-dir "^2.0.0"
     resolve-cwd "^2.0.0"
@@ -4019,24 +4631,29 @@ import-local@^1.0.0:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
 
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -4044,28 +4661,34 @@ inflight@^1.0.4:
 inherits@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
+  integrity sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=
 
 inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
 inline-source-map@~0.6.0:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5"
+  integrity sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=
   dependencies:
     source-map "~0.5.3"
 
 inquirer@^6.1.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
+  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
@@ -4084,6 +4707,7 @@ inquirer@^6.1.0:
 insert-module-globals@^7.0.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.2.0.tgz#ec87e5b42728479e327bd5c5c71611ddfb4752ba"
+  integrity sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw==
   dependencies:
     JSONStream "^1.0.3"
     acorn-node "^1.5.2"
@@ -4099,20 +4723,24 @@ insert-module-globals@^7.0.0:
 interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
 invariant@^2.0.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
   dependencies:
     is-relative "^1.0.0"
     is-windows "^1.0.1"
@@ -4120,68 +4748,81 @@ is-absolute@^1.0.0:
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-boolean-object@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
+  integrity sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=
 
 is-buffer@^1.1.0, is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
   dependencies:
     builtin-modules "^1.0.0"
 
 is-callable@^1.1.3, is-callable@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
 is-ci@^1.0.10:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
+  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
   dependencies:
     ci-info "^1.5.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
 
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -4190,6 +4831,7 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -4198,84 +4840,101 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
   dependencies:
     is-primitive "^2.0.0"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-function@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
+  integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=
 
 is-generator-fn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
+  integrity sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
   dependencies:
     is-extglob "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
   dependencies:
     is-extglob "^2.1.1"
 
 is-in-browser@^1.0.2, is-in-browser@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
+  integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=
 
 is-my-ip-valid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
+  integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==
 
 is-my-json-valid@^2.12.4:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz#8fd6e40363cd06b963fa877d444bfb5eddc62175"
+  integrity sha512-mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q==
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
@@ -4286,180 +4945,219 @@ is-my-json-valid@^2.12.4:
 is-number-like@^1.0.3:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/is-number-like/-/is-number-like-1.0.8.tgz#2e129620b50891042e44e9bbbb30593e75cfbbe3"
+  integrity sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==
   dependencies:
     lodash.isfinite "^3.3.2"
 
 is-number-object@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
+  integrity sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=
 
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
 
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
   dependencies:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
   dependencies:
     path-is-inside "^1.0.1"
 
 is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
 
 is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
 
 is-promise@^2.1, is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
 is-property@^1.0.0, is-property@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
 
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
   dependencies:
     has "^1.0.1"
 
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
 
 is-relative@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
   dependencies:
     is-unc-path "^1.0.0"
 
 is-resolvable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
+  integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
 
 is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-string@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
+  integrity sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=
 
 is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
 is-symbol@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
   dependencies:
     has-symbols "^1.0.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-unc-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
   dependencies:
     unc-path-regex "^0.1.2"
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
+  integrity sha1-3hqm1j6indJIc3tp8f+LgALSEIw=
 
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
 isarray@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.4.tgz#38e7bcbb0f3ba1b7933c86ba1894ddfc3781bbb7"
+  integrity sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-api@^1.3.1:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.7.tgz#a86c770d2b03e11e3f778cd7aedd82d2722092aa"
+  integrity sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==
   dependencies:
     async "^2.1.4"
     fileset "^2.0.2"
@@ -4476,16 +5174,19 @@ istanbul-api@^1.3.1:
 istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
+  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
 
 istanbul-lib-hook@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86"
+  integrity sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==
   dependencies:
     append-transform "^0.4.0"
 
 istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
+  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
@@ -4498,6 +5199,7 @@ istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2:
 istanbul-lib-report@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c"
+  integrity sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==
   dependencies:
     istanbul-lib-coverage "^1.2.1"
     mkdirp "^0.5.1"
@@ -4507,6 +5209,7 @@ istanbul-lib-report@^1.1.5:
 istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f"
+  integrity sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==
   dependencies:
     debug "^3.1.0"
     istanbul-lib-coverage "^1.2.1"
@@ -4517,12 +5220,14 @@ istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
 istanbul-reports@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a"
+  integrity sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==
   dependencies:
     handlebars "^4.0.3"
 
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
+  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
   dependencies:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
@@ -4530,12 +5235,14 @@ isurl@^1.0.0-alpha5:
 jest-changed-files@^23.4.2:
   version "23.4.2"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
+  integrity sha512-EyNhTAUWEfwnK0Is/09LxoqNDOn7mU7S3EHskG52djOFS/z+IT0jT3h3Ql61+dklcG7bJJitIWEMB4Sp1piHmA==
   dependencies:
     throat "^4.0.0"
 
 jest-cli@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.6.0.tgz#61ab917744338f443ef2baa282ddffdd658a5da4"
+  integrity sha512-hgeD1zRUp1E1zsiyOXjEn4LzRLWdJBV//ukAHGlx6s5mfCNJTbhbHjgxnDUXA8fsKWN/HqFFF6X5XcCwC/IvYQ==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
@@ -4577,6 +5284,7 @@ jest-cli@^23.6.0:
 jest-config@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d"
+  integrity sha512-i8V7z9BeDXab1+VNo78WM0AtWpBRXJLnkT+lyT+Slx/cbP5sZJ0+NDuLcmBE5hXAoK0aUp7vI+MOxR+R4d8SRQ==
   dependencies:
     babel-core "^6.0.0"
     babel-jest "^23.6.0"
@@ -4596,6 +5304,7 @@ jest-config@^23.6.0:
 jest-diff@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.6.0.tgz#1500f3f16e850bb3d71233408089be099f610c7d"
+  integrity sha512-Gz9l5Ov+X3aL5L37IT+8hoCUsof1CVYBb2QEkOupK64XyRR3h+uRpYIm97K7sY8diFxowR8pIGEdyfMKTixo3g==
   dependencies:
     chalk "^2.0.1"
     diff "^3.2.0"
@@ -4605,12 +5314,14 @@ jest-diff@^23.6.0:
 jest-docblock@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
+  integrity sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=
   dependencies:
     detect-newline "^2.1.0"
 
 jest-each@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.6.0.tgz#ba0c3a82a8054387016139c733a05242d3d71575"
+  integrity sha512-x7V6M/WGJo6/kLoissORuvLIeAoyo2YqLOoCDkohgJ4XOXSqOtyvr8FbInlAWS77ojBsZrafbozWoKVRdtxFCg==
   dependencies:
     chalk "^2.0.1"
     pretty-format "^23.6.0"
@@ -4618,6 +5329,7 @@ jest-each@^23.6.0:
 jest-environment-jsdom@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
+  integrity sha1-BWp5UrP+pROsYqFAosNox52eYCM=
   dependencies:
     jest-mock "^23.2.0"
     jest-util "^23.4.0"
@@ -4626,6 +5338,7 @@ jest-environment-jsdom@^23.4.0:
 jest-environment-node@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
+  integrity sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA=
   dependencies:
     jest-mock "^23.2.0"
     jest-util "^23.4.0"
@@ -4633,10 +5346,12 @@ jest-environment-node@^23.4.0:
 jest-get-type@^22.1.0:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
+  integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
 
 jest-haste-map@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.6.0.tgz#2e3eb997814ca696d62afdb3f2529f5bbc935e16"
+  integrity sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg==
   dependencies:
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.11"
@@ -4650,6 +5365,7 @@ jest-haste-map@^23.6.0:
 jest-jasmine2@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0"
+  integrity sha512-pe2Ytgs1nyCs8IvsEJRiRTPC0eVYd8L/dXJGU08GFuBwZ4sYH/lmFDdOL3ZmvJR8QKqV9MFuwlsAi/EWkFUbsQ==
   dependencies:
     babel-traverse "^6.0.0"
     chalk "^2.0.1"
@@ -4667,6 +5383,7 @@ jest-jasmine2@^23.6.0:
 jest-junit@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-5.2.0.tgz#980401db7aa69999cf117c6d740a8135c22ae379"
+  integrity sha512-Mdg0Qpdh1Xm/FA1B/mcLlmEmlr3XzH5pZg7MvcAwZhjHijPRd1z/UwYwkwNHmCV7o4ZOWCf77nLu7ZkhHHrtJg==
   dependencies:
     jest-config "^23.6.0"
     jest-validate "^23.0.1"
@@ -4677,12 +5394,14 @@ jest-junit@^5.1.0:
 jest-leak-detector@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz#e4230fd42cf381a1a1971237ad56897de7e171de"
+  integrity sha512-f/8zA04rsl1Nzj10HIyEsXvYlMpMPcy0QkQilVZDFOaPbv2ur71X5u2+C4ZQJGyV/xvVXtCCZ3wQ99IgQxftCg==
   dependencies:
     pretty-format "^23.6.0"
 
 jest-matcher-utils@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz#726bcea0c5294261a7417afb6da3186b4b8cac80"
+  integrity sha512-rosyCHQfBcol4NsckTn01cdelzWLU9Cq7aaigDf8VwwpIRvWE/9zLgX2bON+FkEW69/0UuYslUe22SOdEf2nog==
   dependencies:
     chalk "^2.0.1"
     jest-get-type "^22.1.0"
@@ -4691,6 +5410,7 @@ jest-matcher-utils@^23.6.0:
 jest-message-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
+  integrity sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8=
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.35"
     chalk "^2.0.1"
@@ -4701,14 +5421,17 @@ jest-message-util@^23.4.0:
 jest-mock@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
+  integrity sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=
 
 jest-regex-util@^23.3.0:
   version "23.3.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
+  integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=
 
 jest-resolve-dependencies@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d"
+  integrity sha512-EkQWkFWjGKwRtRyIwRwI6rtPAEyPWlUC2MpzHissYnzJeHcyCn1Hc8j7Nn1xUVrS5C6W5+ZL37XTem4D4pLZdA==
   dependencies:
     jest-regex-util "^23.3.0"
     jest-snapshot "^23.6.0"
@@ -4716,6 +5439,7 @@ jest-resolve-dependencies@^23.6.0:
 jest-resolve@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae"
+  integrity sha512-XyoRxNtO7YGpQDmtQCmZjum1MljDqUCob7XlZ6jy9gsMugHdN2hY4+Acz9Qvjz2mSsOnPSH7skBmDYCHXVZqkA==
   dependencies:
     browser-resolve "^1.11.3"
     chalk "^2.0.1"
@@ -4724,6 +5448,7 @@ jest-resolve@^23.6.0:
 jest-runner@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.6.0.tgz#3894bd219ffc3f3cb94dc48a4170a2e6f23a5a38"
+  integrity sha512-kw0+uj710dzSJKU6ygri851CObtCD9cN8aNkg8jWJf4ewFyEa6kwmiH/r/M1Ec5IL/6VFa0wnAk6w+gzUtjJzA==
   dependencies:
     exit "^0.1.2"
     graceful-fs "^4.1.11"
@@ -4742,6 +5467,7 @@ jest-runner@^23.6.0:
 jest-runtime@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.6.0.tgz#059e58c8ab445917cd0e0d84ac2ba68de8f23082"
+  integrity sha512-ycnLTNPT2Gv+TRhnAYAQ0B3SryEXhhRj1kA6hBPSeZaNQkJ7GbZsxOLUkwg6YmvWGdX3BB3PYKFLDQCAE1zNOw==
   dependencies:
     babel-core "^6.0.0"
     babel-plugin-istanbul "^4.1.6"
@@ -4768,10 +5494,12 @@ jest-runtime@^23.6.0:
 jest-serializer@^23.0.1:
   version "23.0.1"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
+  integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=
 
 jest-snapshot@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a"
+  integrity sha512-tM7/Bprftun6Cvj2Awh/ikS7zV3pVwjRYU2qNYS51VZHgaAMBs5l4o/69AiDHhQrj5+LA2Lq4VIvK7zYk/bswg==
   dependencies:
     babel-types "^6.0.0"
     chalk "^2.0.1"
@@ -4787,6 +5515,7 @@ jest-snapshot@^23.6.0:
 jest-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
+  integrity sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE=
   dependencies:
     callsites "^2.0.0"
     chalk "^2.0.1"
@@ -4800,6 +5529,7 @@ jest-util@^23.4.0:
 jest-validate@^23.0.1, jest-validate@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474"
+  integrity sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==
   dependencies:
     chalk "^2.0.1"
     jest-get-type "^22.1.0"
@@ -4809,6 +5539,7 @@ jest-validate@^23.0.1, jest-validate@^23.6.0:
 jest-watcher@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
+  integrity sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
@@ -4817,12 +5548,14 @@ jest-watcher@^23.4.0:
 jest-worker@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
+  integrity sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=
   dependencies:
     merge-stream "^1.0.1"
 
 jest@^23.5.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d"
+  integrity sha512-lWzcd+HSiqeuxyhG+EnZds6iO3Y3ZEnMrfZq/OTGvF/C+Z4fPMCdhWTGSAiO2Oym9rbEXfwddHhh6jqrTF3+Lw==
   dependencies:
     import-local "^1.0.0"
     jest-cli "^23.6.0"
@@ -4830,22 +5563,27 @@ jest@^23.5.0:
 js-base64@^2.1.8:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
+  integrity sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==
 
 js-levenshtein@^1.1.3:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.4.tgz#3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e"
+  integrity sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
 js-yaml@3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
+  integrity sha1-bl/mfYsgXOTSL60Ft3geja3MSzA=
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
@@ -4853,6 +5591,7 @@ js-yaml@3.6.1:
 js-yaml@^3.12.0, js-yaml@^3.7.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -4860,10 +5599,12 @@ js-yaml@^3.12.0, js-yaml@^3.7.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsdom@^11.5.1:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
+  integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==
   dependencies:
     abab "^2.0.0"
     acorn "^5.5.3"
@@ -4895,76 +5636,93 @@ jsdom@^11.5.1:
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
 
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
 json-stable-stringify@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45"
+  integrity sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=
   dependencies:
     jsonify "~0.0.0"
 
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
 jsonfile@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
+  integrity sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
 
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
@@ -4974,42 +5732,50 @@ jsprim@^1.2.2:
 jss-camel-case@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jss-camel-case/-/jss-camel-case-6.1.0.tgz#ccb1ff8d6c701c02a1fed6fb6fb6b7896e11ce44"
+  integrity sha512-HPF2Q7wmNW1t79mCqSeU2vdd/vFFGpkazwvfHMOhPlMgXrJDzdj9viA2SaHk9ZbD5pfL63a8ylp4++irYbbzMQ==
   dependencies:
     hyphenate-style-name "^1.0.2"
 
 jss-compose@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/jss-compose/-/jss-compose-5.0.0.tgz#ce01b2e4521d65c37ea42cf49116e5f7ab596484"
+  integrity sha512-YofRYuiA0+VbeOw0VjgkyO380sA4+TWDrW52nSluD9n+1FWOlDzNbgpZ/Sb3Y46+DcAbOS21W5jo6SAqUEiuwA==
   dependencies:
     warning "^3.0.0"
 
 jss-default-unit@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/jss-default-unit/-/jss-default-unit-8.0.2.tgz#cc1e889bae4c0b9419327b314ab1c8e2826890e6"
+  integrity sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg==
 
 jss-expand@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/jss-expand/-/jss-expand-5.3.0.tgz#02be076efe650125c842f5bb6fb68786fe441ed6"
+  integrity sha512-NiM4TbDVE0ykXSAw6dfFmB1LIqXP/jdd0ZMnlvlGgEMkMt+weJIl8Ynq1DsuBY9WwkNyzWktdqcEW2VN0RAtQg==
 
 jss-extend@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/jss-extend/-/jss-extend-6.2.0.tgz#4af09d0b72fb98ee229970f8ca852fec1ca2a8dc"
+  integrity sha512-YszrmcB6o9HOsKPszK7NeDBNNjVyiW864jfoiHoMlgMIg2qlxKw70axZHqgczXHDcoyi/0/ikP1XaHDPRvYtEA==
   dependencies:
     warning "^3.0.0"
 
 jss-global@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/jss-global/-/jss-global-3.0.0.tgz#e19e5c91ab2b96353c227e30aa2cbd938cdaafa2"
+  integrity sha512-wxYn7vL+TImyQYGAfdplg7yaxnPQ9RaXY/cIA8hawaVnmmWxDHzBK32u1y+RAvWboa3lW83ya3nVZ/C+jyjZ5Q==
 
 jss-nested@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/jss-nested/-/jss-nested-6.0.1.tgz#ef992b79d6e8f63d939c4397b9d99b5cbbe824ca"
+  integrity sha512-rn964TralHOZxoyEgeq3hXY8hyuCElnvQoVrQwKHVmu55VRDd6IqExAx9be5HgK0yN/+hQdgAXQl/GUrBbbSTA==
   dependencies:
     warning "^3.0.0"
 
 jss-preset-default@^4.3.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/jss-preset-default/-/jss-preset-default-4.5.0.tgz#d3a457012ccd7a551312014e394c23c4b301cadd"
+  integrity sha512-qZbpRVtHT7hBPpZEBPFfafZKWmq3tA/An5RNqywDsZQGrlinIF/mGD9lmj6jGqu8GrED2SMHZ3pPKLmjCZoiaQ==
   dependencies:
     jss-camel-case "^6.1.0"
     jss-compose "^5.0.0"
@@ -5025,22 +5791,26 @@ jss-preset-default@^4.3.0:
 jss-props-sort@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/jss-props-sort/-/jss-props-sort-6.0.0.tgz#9105101a3b5071fab61e2d85ea74cc22e9b16323"
+  integrity sha512-E89UDcrphmI0LzmvYk25Hp4aE5ZBsXqMWlkFXS0EtPkunJkRr+WXdCNYbXbksIPnKlBenGB9OxzQY+mVc70S+g==
 
 jss-template@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/jss-template/-/jss-template-1.0.1.tgz#09aed9d86cc547b07f53ef355d7e1777f7da430a"
+  integrity sha512-m5BqEWha17fmIVXm1z8xbJhY6GFJxNB9H68GVnCWPyGYfxiAgY9WTQyvDAVj+pYRgrXSOfN5V1T4+SzN1sJTeg==
   dependencies:
     warning "^3.0.0"
 
 jss-vendor-prefixer@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz#0166729650015ef19d9f02437c73667231605c71"
+  integrity sha512-Agd+FKmvsI0HLcYXkvy8GYOw3AAASBUpsmIRvVQheps+JWaN892uFOInTr0DRydwaD91vSSUCU4NssschvF7MA==
   dependencies:
     css-vendor "^0.3.8"
 
 jss@^9.7.0:
   version "9.8.7"
   resolved "https://registry.yarnpkg.com/jss/-/jss-9.8.7.tgz#ed9763fc0f2f0260fc8260dac657af61e622ce05"
+  integrity sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==
   dependencies:
     is-in-browser "^1.1.3"
     symbol-observable "^1.1.0"
@@ -5049,36 +5819,43 @@ jss@^9.7.0:
 jsx-ast-utils@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
+  integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=
   dependencies:
     array-includes "^3.0.3"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 kleur@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
+  integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==
 
 labeled-stream-splicer@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz#9cffa32fd99e1612fd1d86a8db962416d5292926"
+  integrity sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==
   dependencies:
     inherits "^2.0.1"
     isarray "^2.0.4"
@@ -5087,24 +5864,29 @@ labeled-stream-splicer@^2.0.0:
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
 lcov-parse@0.0.10:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
+  integrity sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=
 
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
+  integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
 
 leven@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+  integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA=
 
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
@@ -5112,6 +5894,7 @@ levn@^0.3.0, levn@~0.3.0:
 liftoff@^2.1.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
+  integrity sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=
   dependencies:
     extend "^3.0.0"
     findup-sync "^2.0.0"
@@ -5125,14 +5908,17 @@ liftoff@^2.1.0:
 limiter@^1.0.5:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.3.tgz#32e2eb55b2324076943e5d04c1185ffb387968ef"
+  integrity sha512-zrycnIMsLw/3ZxTbW7HCez56rcFGecWTx5OZNplzcXUUmJLmoYArC6qdJzmAN5BWiNXGcpjhF9RQ1HSv5zebEw==
 
 listenercount@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"
+  integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=
 
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -5143,6 +5929,7 @@ load-json-file@^1.0.0:
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -5152,6 +5939,7 @@ load-json-file@^2.0.0:
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
@@ -5161,6 +5949,7 @@ load-json-file@^4.0.0:
 localtunnel@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-1.9.1.tgz#1d1737eab658add5a40266d8e43f389b646ee3b1"
+  integrity sha512-HWrhOslklDvxgOGFLxi6fQVnvpl6XdX4sPscfqMZkzi3gtt9V7LKBWYvNUcpHSVvjwCQ6xzXacVvICNbNcyPnQ==
   dependencies:
     axios "0.17.1"
     debug "2.6.9"
@@ -5170,6 +5959,7 @@ localtunnel@1.9.1:
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -5177,96 +5967,119 @@ locate-path@^2.0.0:
 lodash-es@^4.17.5:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0"
+  integrity sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q==
 
 lodash._basecopy@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
 
 lodash._basetostring@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
+  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
 
 lodash._basevalues@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
+  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
 
 lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
 
 lodash._isiterateecall@^3.0.0:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
 
 lodash._reescape@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
+  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
 
 lodash._reevaluate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
+  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
 
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
 lodash._root@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
+  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
 
 lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
 lodash.clonedeep@^4.3.2:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
 lodash.escape@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
+  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
   dependencies:
     lodash._root "^3.0.0"
 
 lodash.escape@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
+  integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=
 
 lodash.findlastindex@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.findlastindex/-/lodash.findlastindex-4.6.0.tgz#b8375ac0f02e9b926375cdf8dc3ea814abf9c6ac"
+  integrity sha1-uDdawPAum5Jjdc343D6oFKv5xqw=
 
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
+  integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
 
 lodash.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
 
 lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
 
 lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
 lodash.isfinite@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3"
+  integrity sha1-+4m2WpqAKBgz8LdHizpRBPiY67M=
 
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
   dependencies:
     lodash._getnative "^3.0.0"
     lodash.isarguments "^3.0.0"
@@ -5275,26 +6088,32 @@ lodash.keys@^3.0.0:
 lodash.mapvalues@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
+  integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=
 
 lodash.memoize@~3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
+  integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
 
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
+  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
 
 lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
 
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
 lodash.template@^3.0.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
+  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
   dependencies:
     lodash._basecopy "^3.0.0"
     lodash._basetostring "^3.0.0"
@@ -5309,6 +6128,7 @@ lodash.template@^3.0.0:
 lodash.templatesettings@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
+  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
   dependencies:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
@@ -5316,24 +6136,29 @@ lodash.templatesettings@^3.0.0:
 lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 lodash@~1.0.1:
   version "1.0.2"
   resolved "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
+  integrity sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=
 
 log-driver@1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"
+  integrity sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
@@ -5341,14 +6166,17 @@ loud-rejection@^1.0.0:
 lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
 lru-cache@2:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
+  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
 
 lru-cache@^4.0.1:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -5356,60 +6184,72 @@ lru-cache@^4.0.1:
 lru-queue@0.1:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
+  integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=
   dependencies:
     es5-ext "~0.10.2"
 
 macos-release@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-1.1.0.tgz#831945e29365b470aa8724b0ab36c8f8959d10fb"
+  integrity sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==
 
 make-error-cause@^1.1.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/make-error-cause/-/make-error-cause-1.2.2.tgz#df0388fcd0b37816dff0a5fb8108939777dcbc9d"
+  integrity sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=
   dependencies:
     make-error "^1.2.0"
 
 make-error@^1.2.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
+  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
 make-iterator@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
+  integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
   dependencies:
     kind-of "^6.0.2"
 
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
   dependencies:
     tmpl "1.0.x"
 
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8"
+  integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
 
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -5418,6 +6258,7 @@ md5.js@^1.3.4:
 md5@^2.1.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
   dependencies:
     charenc "~0.0.1"
     crypt "~0.0.1"
@@ -5426,12 +6267,14 @@ md5@^2.1.0:
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
   dependencies:
     mimic-fn "^1.0.0"
 
 memoizee@0.4.X:
   version "0.4.14"
   resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.14.tgz#07a00f204699f9a95c2d9e77218271c7cd610d57"
+  integrity sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==
   dependencies:
     d "1"
     es5-ext "^0.10.45"
@@ -5445,10 +6288,12 @@ memoizee@0.4.X:
 memorystream@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
 
 meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -5464,16 +6309,19 @@ meow@^3.7.0:
 merge-stream@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
   dependencies:
     readable-stream "^2.0.1"
 
 merge@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+  integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
 
 micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -5492,6 +6340,7 @@ micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -5510,6 +6359,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
@@ -5517,52 +6367,63 @@ miller-rabin@^4.0.0:
 mime-db@~1.36.0:
   version "1.36.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19, mime-types@~2.1.7:
   version "2.1.20"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
   dependencies:
     mime-db "~1.36.0"
 
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
 mime@^1.3.6:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
 minimatch@^2.0.1:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
+  integrity sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=
   dependencies:
     brace-expansion "^1.0.0"
 
 minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimatch@~0.2.11:
   version "0.2.14"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
+  integrity sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=
   dependencies:
     lru-cache "2"
     sigmund "~1.0.0"
@@ -5570,18 +6431,22 @@ minimatch@~0.2.11:
 minimist@0.0.8:
   version "0.0.8"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
 minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
 minipass@^2.2.1, minipass@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
+  integrity sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -5589,29 +6454,39 @@ minipass@^2.2.1, minipass@^2.3.3:
 minizlib@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
   dependencies:
     minipass "^2.2.1"
 
 mitt@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.1.3.tgz#528c506238a05dce11cd914a741ea2cc332da9b8"
+  integrity sha512-mUDCnVNsAi+eD6qA0HkRkwYczbLHJ49z17BGe2PYRhZL4wpZUFZGJHU7/5tmvohoma+Hdn0Vh/oJTiPEmgSruA==
 
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+mkdirp@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
+  integrity sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=
+
 "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
 module-deps@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.1.0.tgz#d1e1efc481c6886269f7112c52c3236188e16479"
+  integrity sha512-NPs5N511VD1rrVJihSso/LiBShRbJALYBKzDW91uZYy7BpjnO4bGnZL3HjZ9yKcFdZUWwaYjDz9zxbuP7vKMuQ==
   dependencies:
     JSONStream "^1.0.3"
     browser-resolve "^1.7.0"
@@ -5632,40 +6507,49 @@ module-deps@^6.0.0:
 moment@^2.22.2:
   version "2.22.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
+  integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
 
 moo@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz#3f847a26f31cf625a956a87f2b10fbc013bfd10e"
+  integrity sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw==
 
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
 multipipe@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
+  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
   dependencies:
     duplexer2 "0.0.2"
 
 mustache@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5"
+  integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ==
 
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
 nan@^2.10.0, nan@^2.9.2:
   version "2.11.1"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
+  integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -5682,14 +6566,17 @@ nanomatch@^1.2.9:
 natives@^1.1.0:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.5.tgz#3bdbdb4104023e5dd239b56fc7ef3d9a17acc6aa"
+  integrity sha512-1pJ+02gl2KJgCPFtpZGtuD4lGSJnIZvvFHCQTOeDRMSXjfu2GmYWuhI8NFMA4W2I5NNFRbfy/YCiVt4CgNpP8A==
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
 nearley@^2.7.10:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.15.1.tgz#965e4e6ec9ed6b80fc81453e161efbcebb36d247"
+  integrity sha512-8IUY/rUrKz2mIynUGh8k+tul1awMKEjeHHC5G3FHvvyAW6oq4mQfNp2c0BMea+sYZJvYcrrM6GmZVIle/GRXGw==
   dependencies:
     moo "^0.4.3"
     nomnom "~1.6.2"
@@ -5700,6 +6587,7 @@ nearley@^2.7.10:
 needle@^2.2.1:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
+  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
   dependencies:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
@@ -5708,26 +6596,32 @@ needle@^2.2.1:
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
 next-tick@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 nimn-date-parser@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/nimn-date-parser/-/nimn-date-parser-1.0.0.tgz#4ce55d1fd5ea206bbe82b76276f7b7c582139351"
+  integrity sha512-1Nf+x3EeMvHUiHsVuEhiZnwA8RMeOBVTQWfB1S2n9+i6PYCofHd2HRMD+WOHIHYshy4T4Gk8wQoCol7Hq3av8Q==
 
 nimn_schema_builder@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/nimn_schema_builder/-/nimn_schema_builder-1.1.0.tgz#b370ccf5b647d66e50b2dcfb20d0aa12468cd247"
+  integrity sha512-DK5/B8CM4qwzG2URy130avcwPev4uO0ev836FbQyKo1ms6I9z/i6EJyiZ+d9xtgloxUri0W+5gfR8YbPq7SheA==
 
 nimnjs@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/nimnjs/-/nimnjs-1.3.2.tgz#a6a877968d87fad836375a4f616525e55079a5ba"
+  integrity sha512-TIOtI4iqkQrUM1tiM76AtTQem0c7e56SkDZ7sj1d1MfUsqRcq2ZWQvej/O+HBTZV7u/VKnwlKTDugK/75IRPPw==
   dependencies:
     nimn-date-parser "^1.0.0"
     nimn_schema_builder "^1.0.0"
@@ -5735,10 +6629,12 @@ nimnjs@^1.3.2:
 node-fetch@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
+  integrity sha512-OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA==
 
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
   dependencies:
     fstream "^1.0.0"
     glob "^7.0.3"
@@ -5756,14 +6652,17 @@ node-gyp@^3.8.0:
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
 node-mkdirs@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/node-mkdirs/-/node-mkdirs-0.0.1.tgz#b20f50ba796a4f543c04a69942d06d06f8aaf552"
+  integrity sha1-sg9QunlqT1Q8BKaZQtBtBviq9VI=
 
 node-notifier@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea"
+  integrity sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==
   dependencies:
     growly "^1.3.0"
     semver "^5.4.1"
@@ -5773,6 +6672,7 @@ node-notifier@^5.2.1:
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -5788,12 +6688,14 @@ node-pre-gyp@^0.10.0:
 node-releases@^1.0.0-alpha.12:
   version "1.0.0-alpha.12"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.12.tgz#32e461b879ea76ac674e511d9832cf29da345268"
+  integrity sha512-VPB4rTPqpVyWKBHbSa4YPFme3+8WHsOSpvbp0Mfj0bWsC8TEjt4HQrLl1hsBDELlp1nB4lflSgSuGTYiuyaP7Q==
   dependencies:
     semver "^5.3.0"
 
 node-sass-chokidar@^1.3.0:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/node-sass-chokidar/-/node-sass-chokidar-1.3.3.tgz#0bc83b6f4a8264ae27cbc80b18c49ed445d07d68"
+  integrity sha512-Y8G/5orw1IJzkhzuKQG9K0i6/InbV5AF/6Jvk23rPFTWcJobG7Bp0bobQC05uRFv1yGdBexakKt+GHfDtuVEvw==
   dependencies:
     async-foreach "^0.1.3"
     chokidar "^2.0.4"
@@ -5807,6 +6709,7 @@ node-sass-chokidar@^1.3.0:
 node-sass@^4.9.2, node-sass@^4.9.3:
   version "4.9.3"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
+  integrity sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -5831,6 +6734,7 @@ node-sass@^4.9.2, node-sass@^4.9.3:
 nomnom@~1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971"
+  integrity sha1-hKZqJgF0QI/Ft3oY+IjszET7aXE=
   dependencies:
     colors "0.5.x"
     underscore "~1.4.4"
@@ -5838,19 +6742,29 @@ nomnom@~1.6.2:
 noms@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859"
+  integrity sha1-2o69nzr51nYJGbJ9nNyAkqczKFk=
   dependencies:
     inherits "^2.0.1"
     readable-stream "~1.0.31"
 
+nopt@1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
+  integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=
+  dependencies:
+    abbrev "1"
+
 "nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
@@ -5858,6 +6772,7 @@ nopt@^4.0.1:
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -5867,16 +6782,19 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
 npm-packlist@^1.1.6:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
+  integrity sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -5884,6 +6802,7 @@ npm-packlist@^1.1.6:
 npm-run-all@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.3.tgz#49f15b55a66bb4101664ce270cb18e7103f8f185"
+  integrity sha512-aOG0N3Eo/WW+q6sUIdzcV2COS8VnTZCmdji0VQIAZF3b+a3YWb0AD0vFIyjKec18A7beLGbaQ5jFTNI2bPt9Cg==
   dependencies:
     ansi-styles "^3.2.0"
     chalk "^2.1.0"
@@ -5898,12 +6817,14 @@ npm-run-all@^4.1.3:
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
 "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -5913,40 +6834,49 @@ npm-run-path@^2.0.0:
 nth-check@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
+  integrity sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=
   dependencies:
     boolbase "~1.0.0"
 
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 nwsapi@^2.0.7:
   version "2.0.9"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016"
+  integrity sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ==
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@4.X, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-assign@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
+  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
 
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -5955,28 +6885,34 @@ object-copy@^0.1.0:
 object-inspect@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
+  integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
 
 object-is@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
+  integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=
 
 object-keys@^1.0.11, object-keys@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
+  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
 
 object-path@^0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.9.2.tgz#0fd9a74fc5fad1ae3968b586bda5c632bd6c05a5"
+  integrity sha1-D9mnT8X60a45aLWGvaXGMr1sBaU=
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
 object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
   dependencies:
     define-properties "^1.1.2"
     function-bind "^1.1.1"
@@ -5986,6 +6922,7 @@ object.assign@^4.1.0:
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
+  integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
   dependencies:
     array-each "^1.0.1"
     array-slice "^1.0.0"
@@ -5995,6 +6932,7 @@ object.defaults@^1.1.0:
 object.entries@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
+  integrity sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.6.1"
@@ -6004,6 +6942,7 @@ object.entries@^1.0.4:
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
@@ -6011,6 +6950,7 @@ object.getownpropertydescriptors@^2.0.3:
 object.map@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
+  integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
   dependencies:
     for-own "^1.0.0"
     make-iterator "^1.0.0"
@@ -6018,6 +6958,7 @@ object.map@^1.0.0:
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
@@ -6025,12 +6966,14 @@ object.omit@^2.0.0:
 object.pick@^1.2.0, object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
 object.values@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a"
+  integrity sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.6.1"
@@ -6040,40 +6983,47 @@ object.values@^1.0.4:
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
 once@^1.3.0, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 once@~1.3.0:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
+  integrity sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=
   dependencies:
     wrappy "1"
 
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
     mimic-fn "^1.0.0"
 
 openurl@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.1.tgz#3875b4b0ef7a52c156f0db41d4609dbb0f94b387"
+  integrity sha1-OHW0sO96UsFW8NtB1GCduw+Us4c=
 
 opn@5.3.0:
   version "5.3.0"
   resolved "http://registry.npmjs.org/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+  integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
   dependencies:
     is-wsl "^1.1.0"
 
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -6081,6 +7031,7 @@ optimist@^0.6.1:
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -6092,6 +7043,7 @@ optionator@^0.8.1, optionator@^0.8.2:
 orchestrator@^0.3.0:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
+  integrity sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=
   dependencies:
     end-of-stream "~0.1.5"
     sequencify "~0.0.7"
@@ -6100,24 +7052,29 @@ orchestrator@^0.3.0:
 ordered-read-streams@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
+  integrity sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=
 
 os-browserify@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
   resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
 
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
   dependencies:
     execa "^0.7.0"
     lcid "^1.0.0"
@@ -6126,6 +7083,7 @@ os-locale@^2.0.0:
 os-name@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/os-name/-/os-name-2.0.1.tgz#b9a386361c17ae3a21736ef0599405c9a8c5dc5e"
+  integrity sha1-uaOGNhwXrjohc27wWZQFyajF3F4=
   dependencies:
     macos-release "^1.0.0"
     win-release "^1.0.0"
@@ -6133,10 +7091,12 @@ os-name@^2.0.1:
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@0, osenv@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -6144,52 +7104,62 @@ osenv@0, osenv@^0.1.4:
 outpipe@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/outpipe/-/outpipe-1.1.1.tgz#50cf8616365e87e031e29a5ec9339a3da4725fa2"
+  integrity sha1-UM+GFjZeh+Ax4ppeyTOaPaRyX6I=
   dependencies:
     shell-quote "^1.4.2"
 
 p-cancelable@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
+  integrity sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
 p-timeout@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386"
+  integrity sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=
   dependencies:
     p-finally "^1.0.0"
 
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
 
 parents@^1.0.0, parents@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751"
+  integrity sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=
   dependencies:
     path-platform "~0.11.15"
 
 parse-asn1@^5.0.0:
   version "5.1.1"
   resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -6200,6 +7170,7 @@ parse-asn1@^5.0.0:
 parse-filepath@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
+  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
   dependencies:
     is-absolute "^1.0.0"
     map-cache "^0.2.0"
@@ -6208,6 +7179,7 @@ parse-filepath@^1.0.1:
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -6217,12 +7189,14 @@ parse-glob@^3.0.4:
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -6230,98 +7204,119 @@ parse-json@^4.0.0:
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
 parse5@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
+  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
   dependencies:
     "@types/node" "*"
 
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
   dependencies:
     better-assert "~1.0.0"
 
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
   dependencies:
     better-assert "~1.0.0"
 
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-browserify@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-platform@~0.11.15:
   version "0.11.15"
   resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2"
+  integrity sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=
 
 path-root-regex@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
 
 path-root@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
   dependencies:
     path-root-regex "^0.1.0"
 
 path-to-regexp@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+  integrity sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=
   dependencies:
     isarray "0.0.1"
 
 path-to-regexp@^2.2.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.4.0.tgz#35ce7f333d5616f1c1e1bfe266c3aba2e5b2e704"
+  integrity sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==
 
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -6330,24 +7325,28 @@ path-type@^1.0.0:
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
   dependencies:
     pify "^2.0.0"
 
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
 pause-stream@^0.0.11:
   version "0.0.11"
   resolved "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
+  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
   dependencies:
     through "~2.3"
 
 pbkdf2@^3.0.3:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -6358,48 +7357,58 @@ pbkdf2@^3.0.3:
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
+  integrity sha1-ektQio1bstYp1EcFb/TpyTFM89Q=
   dependencies:
     find-up "^1.0.0"
 
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
   dependencies:
     find-up "^2.1.0"
 
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
 
 pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
 
 pom-parser@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/pom-parser/-/pom-parser-1.1.1.tgz#6fab4d2498e87c862072ab205aa88b1209e5f966"
+  integrity sha1-b6tNJJjofIYgcqsgWqiLEgnl+WY=
   dependencies:
     bluebird "^3.3.3"
     coveralls "^2.11.3"
@@ -6409,6 +7418,7 @@ pom-parser@^1.1.1:
 portscanner@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96"
+  integrity sha1-6rtAnk3iSVD1oqUW01rnaTQ/u5Y=
   dependencies:
     async "1.5.2"
     is-number-like "^1.0.3"
@@ -6416,10 +7426,12 @@ portscanner@2.1.1:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-easy-import@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-easy-import/-/postcss-easy-import-3.0.0.tgz#8eaaf5ae59566083d0cae98735dfd803e3ab194d"
+  integrity sha512-cfNsear/v8xlkl9v5Wm8y4Do/puiDQTFF+WX2Fo++h7oKt1fKWVVW/5Ca8hslYDQWnjndrg813cA23Pt1jsYdg==
   dependencies:
     globby "^6.1.0"
     is-glob "^4.0.0"
@@ -6433,6 +7445,7 @@ postcss-easy-import@^3.0.0:
 postcss-import@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-10.0.0.tgz#4c85c97b099136cc5ea0240dc1dfdbfde4e2ebbe"
+  integrity sha1-TIXJewmRNsxeoCQNwd/b/eTi674=
   dependencies:
     object-assign "^4.0.1"
     postcss "^6.0.1"
@@ -6443,10 +7456,12 @@ postcss-import@^10.0.0:
 postcss-value-parser@^3.2.3:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
 postcss@^6.0.1, postcss@^6.0.11:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"
@@ -6455,22 +7470,27 @@ postcss@^6.0.1, postcss@^6.0.11:
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
 prettier@^1.13.7, prettier@^1.14.2:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895"
+  integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg==
 
 pretty-format@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"
+  integrity sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
@@ -6478,30 +7498,37 @@ pretty-format@^23.6.0:
 pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
+  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
 
 private@^0.1.6, private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
 process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
 
 process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
+  integrity sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=
 
 prompts@^0.1.9:
   version "0.1.14"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-0.1.14.tgz#a8e15c612c5c9ec8f8111847df3337c9cbd443b2"
+  integrity sha512-rxkyiE9YH6zAz/rZpywySLKkpaj0NMVyNw1qhsubdbjjSgcayjTShDreZGlFMcGSu5sab3bAKPfFk78PB90+8w==
   dependencies:
     kleur "^2.0.1"
     sisteransi "^0.1.1"
@@ -6509,6 +7536,7 @@ prompts@^0.1.9:
 prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
   version "15.6.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+  integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==
   dependencies:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
@@ -6516,20 +7544,24 @@ prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
 ps-tree@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014"
+  integrity sha1-tCGyQUDWID8e08dplrRCewjowBQ=
   dependencies:
     event-stream "~3.3.0"
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
   version "1.1.29"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
+  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
@@ -6541,48 +7573,59 @@ public-encrypt@^4.0.0:
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
 punycode@^1.3.2, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 qs@6.2.3:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
+  integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
 
 qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
+  integrity sha1-51vV9uJoEioqDgvaYwslUMFmUCw=
 
 qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 querystring-es3@~0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 raf@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
+  integrity sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==
   dependencies:
     performance-now "^2.1.0"
 
 railroad-diagrams@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
+  integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=
 
 randexp@0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
+  integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==
   dependencies:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
@@ -6590,6 +7633,7 @@ randexp@0.4.6:
 randomatic@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
+  integrity sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ==
   dependencies:
     is-number "^4.0.0"
     kind-of "^6.0.0"
@@ -6598,12 +7642,14 @@ randomatic@^3.0.0:
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
   dependencies:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
@@ -6611,10 +7657,12 @@ randomfill@^1.0.3:
 range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
 raw-body@^2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
+  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
   dependencies:
     bytes "3.0.0"
     http-errors "1.6.3"
@@ -6624,6 +7672,7 @@ raw-body@^2.3.2:
 rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
@@ -6633,6 +7682,7 @@ rc@^1.2.7:
 react-diff-view@^1.7.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/react-diff-view/-/react-diff-view-1.8.1.tgz#0b9b4adcb92de6730d28177d68654dfcc2097f73"
+  integrity sha512-+soJL85Xnsak/VOdxSgiDKhhaFiOkckiswwrXdiWVCxV3LP9POyJR4AqGVFGdkntJ3YT63mtwTYuunFeId+XSA==
   dependencies:
     classnames "^2.2.6"
     gitdiff-parser "^0.1.2"
@@ -6645,6 +7695,7 @@ react-diff-view@^1.7.0:
 react-dom@^16.4.2:
   version "16.5.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7"
+  integrity sha512-RC8LDw8feuZOHVgzEf7f+cxBr/DnKdqp56VU0lAs1f4UfKc4cU8wU4fTq/mgnvynLQo8OtlPC19NUFh/zjZPuA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -6654,6 +7705,7 @@ react-dom@^16.4.2:
 react-i18next@^7.9.0:
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-7.13.0.tgz#a6f64fd749215ec70400f90da6cbde2a9c5b1588"
+  integrity sha512-35M+MZFPqHwVIas7tXWQKFrf+ozCJukNplUTiGqL8mczSk+VRBsHxxXuuQKRkz/4CcWkONGWbp/AzxfM6wZncg==
   dependencies:
     hoist-non-react-statics "^2.3.1"
     html-parse-stringify2 "2.0.1"
@@ -6662,10 +7714,12 @@ react-i18next@^7.9.0:
 react-is@^16.5.2:
   version "16.5.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.5.2.tgz#e2a7b7c3f5d48062eb769fcb123505eb928722e3"
+  integrity sha512-hSl7E6l25GTjNEZATqZIuWOgSnpXb3kD0DVCujmg46K5zLxsbiKaaT6VO9slkSBDPZfYs30lwfJwbOFOnoEnKQ==
 
 react-jss@^8.6.0:
   version "8.6.1"
   resolved "https://registry.yarnpkg.com/react-jss/-/react-jss-8.6.1.tgz#a06e2e1d2c4d91b4d11befda865e6c07fbd75252"
+  integrity sha512-SH6XrJDJkAphp602J14JTy3puB2Zxz1FkM3bKVE8wON+va99jnUTKWnzGECb3NfIn9JPR5vHykge7K3/A747xQ==
   dependencies:
     hoist-non-react-statics "^2.5.0"
     jss "^9.7.0"
@@ -6676,6 +7730,7 @@ react-jss@^8.6.0:
 react-redux@^5.0.7:
   version "5.0.7"
   resolved "http://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8"
+  integrity sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==
   dependencies:
     hoist-non-react-statics "^2.5.0"
     invariant "^2.0.0"
@@ -6687,6 +7742,7 @@ react-redux@^5.0.7:
 react-router-dom@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"
+  integrity sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==
   dependencies:
     history "^4.7.2"
     invariant "^2.2.4"
@@ -6698,6 +7754,7 @@ react-router-dom@^4.3.1:
 react-router-enzyme-context@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/react-router-enzyme-context/-/react-router-enzyme-context-1.2.0.tgz#7aa11c80e23278fa31f8a29845f7b37760d99350"
+  integrity sha512-z6+PQ6sdOHsRk9u4gSfsbeEuWZeogffrmgHo4dFXX5t/K8mUFftZBJQ+imzL3f3T6rkIIp+J7I0CeREYgcqe9A==
   dependencies:
     history "^4.7.2"
     prop-types "^15.6.0"
@@ -6705,6 +7762,7 @@ react-router-enzyme-context@^1.2.0:
 react-router-redux@^5.0.0-alpha.9:
   version "5.0.0-alpha.9"
   resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-5.0.0-alpha.9.tgz#825431516e0e6f1fd93b8807f6bd595e23ec3d10"
+  integrity sha512-euSgNIANnRXr4GydIuwA7RZCefrLQzIw5WdXspS8NPYbV+FxrKSS9MKG7U9vb6vsKHONnA4VxrVNWfnMUnUQAw==
   dependencies:
     history "^4.7.2"
     prop-types "^15.6.0"
@@ -6713,6 +7771,7 @@ react-router-redux@^5.0.0-alpha.9:
 react-router@^4.2.0, react-router@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e"
+  integrity sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==
   dependencies:
     history "^4.7.2"
     hoist-non-react-statics "^2.5.0"
@@ -6725,6 +7784,7 @@ react-router@^4.2.0, react-router@^4.3.1:
 react-test-renderer@^16.0.0-0, react-test-renderer@^16.4.1:
   version "16.5.2"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.5.2.tgz#92e9d2c6f763b9821b2e0b22f994ee675068b5ae"
+  integrity sha512-AGbJYbCVx1J6jdUgI4s0hNp+9LxlgzKvXl0ROA3DHTrtjAr00Po1RhDZ/eAq2VC/ww8AHgpDXULh5V2rhEqqJg==
   dependencies:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
@@ -6734,6 +7794,7 @@ react-test-renderer@^16.0.0-0, react-test-renderer@^16.4.1:
 react@^16.4.2:
   version "16.5.2"
   resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42"
+  integrity sha512-FDCSVd3DjVTmbEAjUNX6FgfAmQ+ypJfHUsqUJOYNCBUp1h8lqmtC+0mXJ+JjsWx4KAVTkk1vKd1hLQPvEviSuw==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -6743,18 +7804,21 @@ react@^16.4.2:
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
   dependencies:
     pify "^2.3.0"
 
 read-only-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
+  integrity sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=
   dependencies:
     readable-stream "^2.0.2"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -6762,6 +7826,7 @@ read-pkg-up@^1.0.1:
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
@@ -6769,6 +7834,7 @@ read-pkg-up@^2.0.0:
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -6777,6 +7843,7 @@ read-pkg@^1.0.0:
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
@@ -6785,6 +7852,7 @@ read-pkg@^2.0.0:
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
@@ -6793,6 +7861,7 @@ read-pkg@^3.0.0:
 "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.31:
   version "1.0.34"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -6802,6 +7871,7 @@ read-pkg@^3.0.0:
 readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.5, readable-stream@^2.3.6:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -6814,6 +7884,7 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable
 readable-stream@~1.1.9:
   version "1.1.14"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -6823,6 +7894,7 @@ readable-stream@~1.1.9:
 readable-stream@~2.1.5:
   version "2.1.5"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
+  integrity sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA=
   dependencies:
     buffer-shims "^1.0.0"
     core-util-is "~1.0.0"
@@ -6835,6 +7907,7 @@ readable-stream@~2.1.5:
 readdirp@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
   dependencies:
     graceful-fs "^4.1.11"
     micromatch "^3.1.10"
@@ -6843,18 +7916,21 @@ readdirp@^2.0.0:
 realpath-native@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.2.tgz#cd51ce089b513b45cf9b1516c82989b51ccc6560"
+  integrity sha512-+S3zTvVt9yTntFrBpm7TQmQ3tzpCrnA1a/y+3cUHAc9ZR6aIjG0WNLR+Rj79QpJktY+VeW/TQtFlQ1bzsehI8g==
   dependencies:
     util.promisify "^1.0.0"
 
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
@@ -6862,26 +7938,31 @@ redent@^1.0.0:
 redux-devtools-extension@^2.13.5:
   version "2.13.5"
   resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.5.tgz#3ff34f7227acfeef3964194f5f7fc2765e5c5a39"
+  integrity sha512-QQ9BRy77oURHMdGys9rfQcCQDzXZ1T4oW+eUyE5Cg7DNVau69HJzc4YNDMOmpi0Dzpi1zOQgQ2rUpgJta4Lfqg==
 
 redux-logger@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf"
+  integrity sha1-91VZZvMJjzyIYExEnPC69XeCdL8=
   dependencies:
     deep-diff "^0.3.5"
 
 redux-mock-store@^1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/redux-mock-store/-/redux-mock-store-1.5.3.tgz#1f10528949b7ce8056c2532624f7cafa98576c6d"
+  integrity sha512-ryhkkb/4D4CUGpAV2ln1GOY/uh51aczjcRz9k2L2bPx/Xja3c5pSGJJPyR25GNVRXtKIExScdAgFdiXp68GmJA==
   dependencies:
     lodash.isplainobject "^4.0.6"
 
 redux-thunk@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
+  integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
 
 redux@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.0.tgz#aa698a92b729315d22b34a0553d7e6533555cc03"
+  integrity sha512-NnnHF0h0WVE/hXyrB6OlX67LYRuaf/rJcbWvnHHEPCF/Xa/AZpwhs/20WyqzQae5x4SD2F9nPObgBh2rxAgLiA==
   dependencies:
     loose-envify "^1.1.0"
     symbol-observable "^1.2.0"
@@ -6889,36 +7970,43 @@ redux@^4.0.0:
 regenerate-unicode-properties@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
+  integrity sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==
   dependencies:
     regenerate "^1.4.0"
 
 regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
 regenerator-runtime@^0.10.5:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+  integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regenerator-transform@^0.13.3:
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
+  integrity sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==
   dependencies:
     private "^0.1.6"
 
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
@@ -6926,10 +8014,12 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 regexpp@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
 regexpu-core@^4.1.3, regexpu-core@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d"
+  integrity sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==
   dependencies:
     regenerate "^1.4.0"
     regenerate-unicode-properties "^7.0.0"
@@ -6941,48 +8031,58 @@ regexpu-core@^4.1.3, regexpu-core@^4.2.0:
 regjsgen@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.4.0.tgz#c1eb4c89a209263f8717c782591523913ede2561"
+  integrity sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==
 
 regjsparser@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.3.0.tgz#3c326da7fcfd69fa0d332575a41c8c0cdf588c96"
+  integrity sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==
   dependencies:
     jsesc "~0.5.0"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
 replace-ext@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
+  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
 
 replace-ext@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
+  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
 
 request-promise-core@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
+  integrity sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=
   dependencies:
     lodash "^4.13.1"
 
 request-promise-native@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
+  integrity sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=
   dependencies:
     request-promise-core "1.1.1"
     stealthy-require "^1.1.0"
@@ -6991,6 +8091,7 @@ request-promise-native@^1.0.5:
 request@2.79.0:
   version "2.79.0"
   resolved "http://registry.npmjs.org/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  integrity sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=
   dependencies:
     aws-sign2 "~0.6.0"
     aws4 "^1.2.1"
@@ -7016,6 +8117,7 @@ request@2.79.0:
 request@2.87.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
+  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -7041,6 +8143,7 @@ request@2.87.0:
 request@^2.87.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -7066,14 +8169,17 @@ request@^2.87.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
   dependencies:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
@@ -7081,16 +8187,19 @@ require-uncached@^1.0.3:
 requires-port@1.x.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
   dependencies:
     resolve-from "^3.0.0"
 
 resolve-dir@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
+  integrity sha1-shklmlYC+sXFxJatiUpujMQwJh4=
   dependencies:
     expand-tilde "^1.2.2"
     global-modules "^0.2.3"
@@ -7098,6 +8207,7 @@ resolve-dir@^0.1.0:
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
   dependencies:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
@@ -7105,32 +8215,39 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
 resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
 
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 resolve-pathname@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
+  integrity sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
 resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
+  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
   dependencies:
     path-parse "^1.0.5"
 
 resp-modifier@6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f"
+  integrity sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08=
   dependencies:
     debug "^2.2.0"
     minimatch "^3.0.2"
@@ -7138,6 +8255,7 @@ resp-modifier@6.0.2:
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -7145,16 +8263,19 @@ restore-cursor@^2.0.0:
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -7162,6 +8283,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
 rst-selector-parser@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
+  integrity sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=
   dependencies:
     lodash.flattendeep "^4.4.0"
     nearley "^2.7.10"
@@ -7169,46 +8291,55 @@ rst-selector-parser@^2.2.3:
 rsvp@^3.3.3:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
 
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
   dependencies:
     is-promise "^2.1.0"
 
 rx@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
+  integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
 
 rxjs@^5.5.6:
   version "5.5.12"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc"
+  integrity sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==
   dependencies:
     symbol-observable "1.0.1"
 
 rxjs@^6.1.0:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
   dependencies:
     tslib "^1.9.0"
 
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sane@^2.0.0:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
+  integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o=
   dependencies:
     anymatch "^2.0.0"
     capture-exit "^1.2.0"
@@ -7224,6 +8355,7 @@ sane@^2.0.0:
 sass-graph@^2.1.1, sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
+  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
   dependencies:
     glob "^7.0.0"
     lodash "^4.0.0"
@@ -7233,16 +8365,19 @@ sass-graph@^2.1.1, sass-graph@^2.2.4:
 sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
 schedule@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.5.0.tgz#c128fffa0b402488b08b55ae74bb9df55cc29cc8"
+  integrity sha512-HUcJicG5Ou8xfR//c2rPT0lPIRR09vVvN81T9fqfVgBmhERUbDEQoYKjpBxbueJnCPpSu2ujXzOnRQt6x9o/jw==
   dependencies:
     object-assign "^4.1.1"
 
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
   dependencies:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
@@ -7250,18 +8385,22 @@ scss-tokenizer@^0.2.3:
 "semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
 semver@^4.1.0:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
 
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -7280,10 +8419,12 @@ send@0.16.2:
 sequencify@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
+  integrity sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=
 
 serve-index@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -7296,6 +8437,7 @@ serve-index@1.9.1:
 serve-static@1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
@@ -7305,14 +8447,17 @@ serve-static@1.13.2:
 server-destroy@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
+  integrity sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0=
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -7322,6 +8467,7 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -7331,14 +8477,17 @@ set-value@^2.0.0:
 setimmediate@~1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
 sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4:
   version "2.4.11"
   resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -7346,6 +8495,7 @@ sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4:
 shasum@^1.0.0:
   version "1.0.2"
   resolved "http://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f"
+  integrity sha1-5wEjENj0F/TetXEhUOVni4euVl8=
   dependencies:
     json-stable-stringify "~0.0.0"
     sha.js "~2.4.4"
@@ -7353,16 +8503,19 @@ shasum@^1.0.0:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shell-quote@^1.4.2, shell-quote@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
+  integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
   dependencies:
     array-filter "~0.0.0"
     array-map "~0.0.0"
@@ -7372,36 +8525,44 @@ shell-quote@^1.4.2, shell-quote@^1.6.1:
 shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
 sigmund@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
 simple-concat@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
+  integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=
 
 sisteransi@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
+  integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 slice-ansi@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+  integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -7410,12 +8571,14 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -7429,16 +8592,19 @@ snapdragon@^0.8.1:
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
   dependencies:
     hoek "2.x.x"
 
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
+  integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
 
 socket.io-client@2.1.1, socket.io-client@^2.0.4:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
+  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
   dependencies:
     backo2 "1.0.2"
     base64-arraybuffer "0.1.5"
@@ -7458,6 +8624,7 @@ socket.io-client@2.1.1, socket.io-client@^2.0.4:
 socket.io-parser@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
+  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
   dependencies:
     component-emitter "1.2.1"
     debug "~3.1.0"
@@ -7466,6 +8633,7 @@ socket.io-parser@~3.2.0:
 socket.io@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
+  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
   dependencies:
     debug "~3.1.0"
     engine.io "~3.2.0"
@@ -7477,6 +8645,7 @@ socket.io@2.1.1:
 source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -7487,12 +8656,14 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
 source-map-support@^0.4.15:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
   dependencies:
     source-map "^0.5.6"
 
 source-map-support@^0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -7500,28 +8671,34 @@ source-map-support@^0.5.6:
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.3:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 sparkles@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
+  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
 
 spdx-correct@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.2.tgz#19bb409e91b47b1ad54159243f7312a858db3c2e"
+  integrity sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -7529,10 +8706,12 @@ spdx-correct@^3.0.0:
 spdx-exceptions@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
@@ -7540,26 +8719,31 @@ spdx-expression-parse@^3.0.0:
 spdx-license-ids@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
+  integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 split@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
   version "1.14.2"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -7575,10 +8759,12 @@ sshpk@^1.7.0:
 stack-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
+  integrity sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=
 
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -7586,28 +8772,34 @@ static-extend@^0.1.1:
 "statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
 
 statuses@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
 stdout-stream@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
   dependencies:
     readable-stream "^2.0.1"
 
 stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
 stream-browserify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -7615,6 +8807,7 @@ stream-browserify@^2.0.0:
 stream-combiner2@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
+  integrity sha1-+02KFCDqNidk4hrUeAOXvry0HL4=
   dependencies:
     duplexer2 "~0.1.0"
     readable-stream "^2.0.2"
@@ -7622,6 +8815,7 @@ stream-combiner2@^1.1.1:
 stream-combiner@^0.2.2:
   version "0.2.2"
   resolved "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
+  integrity sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=
   dependencies:
     duplexer "~0.1.1"
     through "~2.3.4"
@@ -7629,10 +8823,12 @@ stream-combiner@^0.2.2:
 stream-consume@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48"
+  integrity sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==
 
 stream-http@^2.0.0:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -7643,6 +8839,7 @@ stream-http@^2.0.0:
 stream-splicer@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.0.tgz#1b63be438a133e4b671cc1935197600175910d83"
+  integrity sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
@@ -7650,6 +8847,7 @@ stream-splicer@^2.0.0:
 stream-throttle@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3"
+  integrity sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM=
   dependencies:
     commander "^2.2.0"
     limiter "^1.0.5"
@@ -7657,6 +8855,7 @@ stream-throttle@^0.1.3:
 string-length@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
+  integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=
   dependencies:
     astral-regex "^1.0.0"
     strip-ansi "^4.0.0"
@@ -7664,6 +8863,7 @@ string-length@^2.0.0:
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -7672,6 +8872,7 @@ string-width@^1.0.1, string-width@^1.0.2:
 "string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
@@ -7679,6 +8880,7 @@ string-width@^1.0.1, string-width@^1.0.2:
 string.prototype.padend@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
+  integrity sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.4.3"
@@ -7687,6 +8889,7 @@ string.prototype.padend@^3.0.0:
 string.prototype.trim@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
+  integrity sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.5.0"
@@ -7695,40 +8898,48 @@ string.prototype.trim@^1.1.2:
 string_decoder@^1.1.1, string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
 stringstream@~0.0.4:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
+  integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-bom-string@1.X:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
+  integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=
 
 strip-bom@3.0.0, strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-bom@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
+  integrity sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=
   dependencies:
     first-chunk-stream "^1.0.0"
     is-utf8 "^0.2.0"
@@ -7736,72 +8947,86 @@ strip-bom@^1.0.0:
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-css-comments@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz#7a5625eff8a2b226cf8947a11254da96e13dae89"
+  integrity sha1-elYl7/iisibPiUehElTaluE9rok=
   dependencies:
     is-regexp "^1.0.0"
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
 strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 subarg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
+  integrity sha1-9izxdYHplrSPyWVpn1TAauJouNI=
   dependencies:
     minimist "^1.1.0"
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^3.1.2:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
   dependencies:
     has-flag "^1.0.0"
 
 supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
 symbol-observable@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
+  integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
 
 symbol-observable@^1.1.0, symbol-observable@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
 symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+  integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=
 
 syntax-error@^1.1.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c"
+  integrity sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==
   dependencies:
     acorn-node "^1.2.0"
 
 table@^4.0.2, table@^4.0.3:
   version "4.0.3"
   resolved "http://registry.npmjs.org/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
+  integrity sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==
   dependencies:
     ajv "^6.0.1"
     ajv-keywords "^3.0.0"
@@ -7813,6 +9038,7 @@ table@^4.0.2, table@^4.0.3:
 tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
@@ -7821,6 +9047,7 @@ tar@^2.0.0:
 tar@^4:
   version "4.4.6"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
+  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
   dependencies:
     chownr "^1.0.1"
     fs-minipass "^1.2.5"
@@ -7833,6 +9060,7 @@ tar@^4:
 test-exclude@^4.2.1:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20"
+  integrity sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==
   dependencies:
     arrify "^1.0.1"
     micromatch "^2.3.11"
@@ -7843,10 +9071,12 @@ test-exclude@^4.2.1:
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
 tfunk@^3.0.1:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/tfunk/-/tfunk-3.1.0.tgz#38e4414fc64977d87afdaa72facb6d29f82f7b5b"
+  integrity sha1-OORBT8ZJd9h6/apy+sttKfgve1s=
   dependencies:
     chalk "^1.1.1"
     object-path "^0.9.0"
@@ -7854,6 +9084,7 @@ tfunk@^3.0.1:
 theming@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/theming/-/theming-1.3.0.tgz#286d5bae80be890d0adc645e5ca0498723725bdc"
+  integrity sha512-ya5Ef7XDGbTPBv5ENTwrwkPUexrlPeiAg/EI9kdlUAZhNlRbCdhMKRgjNX1IcmsmiPcqDQZE6BpSaH+cr31FKw==
   dependencies:
     brcast "^3.0.1"
     is-function "^1.0.1"
@@ -7863,10 +9094,12 @@ theming@^1.3.0:
 throat@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+  integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
 
 through2@2.0.x, through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
@@ -7874,6 +9107,7 @@ through2@2.0.x, through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.3:
 through2@^0.6.1:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
+  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
   dependencies:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
@@ -7881,30 +9115,36 @@ through2@^0.6.1:
 through@2, "through@>=2.2.7 <3", through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.4:
   version "2.3.8"
   resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 tildify@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
+  integrity sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=
   dependencies:
     os-homedir "^1.0.0"
 
 time-stamp@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
 
 timed-out@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
 
 timers-browserify@^1.0.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d"
+  integrity sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=
   dependencies:
     process "~0.11.0"
 
 timers-ext@^0.1.5:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
+  integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
   dependencies:
     es5-ext "~0.10.46"
     next-tick "1"
@@ -7912,38 +9152,46 @@ timers-ext@^0.1.5:
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -7951,6 +9199,7 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
@@ -7960,6 +9209,7 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
   dependencies:
     psl "^1.1.24"
     punycode "^1.4.1"
@@ -7967,76 +9217,92 @@ tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.4.3:
 tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
   dependencies:
     punycode "^1.4.1"
 
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
   dependencies:
     punycode "^2.1.0"
 
 "traverse@>=0.3.0 <0.4":
   version "0.3.9"
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
+  integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
 
 traverse@^0.6.6:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
+  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
 
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
 "true-case-path@^1.0.2":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
   dependencies:
     glob "^7.1.2"
 
 tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tty-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
+  integrity sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tunnel-agent@~0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 ua-parser-js@0.7.17:
   version "0.7.17"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
+  integrity sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g==
 
 uglify-js@^3.0.5, uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
@@ -8044,18 +9310,22 @@ uglify-js@^3.0.5, uglify-js@^3.1.4:
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
 umd@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf"
+  integrity sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==
 
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
 undeclared-identifiers@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz#7d850a98887cff4bd0bf64999c014d08ed6d1acc"
+  integrity sha512-13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ==
   dependencies:
     acorn-node "^1.3.0"
     get-assigned-identifiers "^1.2.0"
@@ -8065,14 +9335,17 @@ undeclared-identifiers@^1.1.2:
 underscore@~1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
+  integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ=
 
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
 
 unicode-match-property-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
   dependencies:
     unicode-canonical-property-names-ecmascript "^1.0.4"
     unicode-property-aliases-ecmascript "^1.0.4"
@@ -8080,14 +9353,17 @@ unicode-match-property-ecmascript@^1.0.4:
 unicode-match-property-value-ecmascript@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
+  integrity sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==
 
 unicode-property-aliases-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
+  integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==
 
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
@@ -8097,24 +9373,29 @@ union-value@^1.0.0:
 unique-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
+  integrity sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=
 
 universal-user-agent@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.0.1.tgz#18e591ca52b1cb804f6b9cbc4c336cf8191f80e1"
+  integrity sha512-vz+heWVydO0iyYAa65VHD7WZkYzhl7BeNVy4i54p4TF8OMiLSXdbuQe4hm+fmWAsL+rVibaQHXfhvkw3c1Ws2w==
   dependencies:
     os-name "^2.0.1"
 
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -8122,6 +9403,7 @@ unset-value@^1.0.0:
 unzipper@^0.8.11:
   version "0.8.14"
   resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.8.14.tgz#ade0524cd2fc14d11b8de258be22f9d247d3f79b"
+  integrity sha512-8rFtE7EP5ssOwGpN2dt1Q4njl0N1hUXJ7sSPz0leU2hRdq6+pra57z4YPBlVqm40vcgv6ooKZEAx48fMTv9x4w==
   dependencies:
     big-integer "^1.6.17"
     binary "~0.3.0"
@@ -8136,34 +9418,41 @@ unzipper@^0.8.11:
 upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
 
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-parse-lax@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
   dependencies:
     prepend-http "^1.0.1"
 
 url-template@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
+  integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE=
 
 url-to-options@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
+  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
 
 url@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -8171,18 +9460,22 @@ url@~0.11.0:
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
+  integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA=
 
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util.promisify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
   dependencies:
     define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
@@ -8190,32 +9483,38 @@ util.promisify@^1.0.0:
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
 util@~0.10.1:
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
   dependencies:
     inherits "2.0.3"
 
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
 uuid@^3.0.0, uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
 v8flags@^2.0.2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
+  integrity sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=
   dependencies:
     user-home "^1.1.1"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -8223,10 +9522,12 @@ validate-npm-package-license@^3.0.1:
 value-equal@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
+  integrity sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -8235,6 +9536,7 @@ verror@1.10.0:
 vinyl-buffer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vinyl-buffer/-/vinyl-buffer-1.0.1.tgz#96c1a3479b8c5392542c612029013b5b27f88bbf"
+  integrity sha1-lsGjR5uMU5JULGEgKQE7Wyf4i78=
   dependencies:
     bl "^1.2.1"
     through2 "^2.0.3"
@@ -8242,6 +9544,7 @@ vinyl-buffer@^1.0.1:
 vinyl-fs@^0.3.0:
   version "0.3.14"
   resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
+  integrity sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=
   dependencies:
     defaults "^1.0.0"
     glob-stream "^3.1.5"
@@ -8255,6 +9558,7 @@ vinyl-fs@^0.3.0:
 vinyl-source-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-2.0.0.tgz#f38a5afb9dd1e93b65d550469ac6182ac4f54b8e"
+  integrity sha1-84pa+53R6Ttl1VBGmsYYKsT1S44=
   dependencies:
     through2 "^2.0.3"
     vinyl "^2.1.0"
@@ -8262,12 +9566,14 @@ vinyl-source-stream@^2.0.0:
 vinyl-sourcemaps-apply@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
+  integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=
   dependencies:
     source-map "^0.5.1"
 
 vinyl@^0.4.0:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
+  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc=
   dependencies:
     clone "^0.2.0"
     clone-stats "^0.0.1"
@@ -8275,6 +9581,7 @@ vinyl@^0.4.0:
 vinyl@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
+  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
   dependencies:
     clone "^1.0.0"
     clone-stats "^0.0.1"
@@ -8283,6 +9590,7 @@ vinyl@^0.5.0:
 vinyl@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
+  integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
   dependencies:
     clone "^2.1.1"
     clone-buffer "^1.0.0"
@@ -8294,38 +9602,45 @@ vinyl@^2.1.0:
 vm-browserify@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
+  integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
 
 void-elements@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
 w3c-hr-time@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
   dependencies:
     browser-process-hrtime "^0.1.2"
 
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
   dependencies:
     makeerror "1.0.x"
 
 warning@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
+  integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=
   dependencies:
     loose-envify "^1.0.0"
 
 warning@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.2.tgz#aa6876480872116fa3e11d434b0d0d8d91e44607"
+  integrity sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==
   dependencies:
     loose-envify "^1.0.0"
 
 watch@~0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
+  integrity sha1-KAlUdsbffJDJYxOJkMClQj60uYY=
   dependencies:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
@@ -8333,6 +9648,7 @@ watch@~0.18.0:
 watchify@^3.11.0:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/watchify/-/watchify-3.11.0.tgz#03f1355c643955e7ab8dcbf399f624644221330f"
+  integrity sha512-7jWG0c3cKKm2hKScnSAMUEUjRJKXUShwMPk0ASVhICycQhwND3IMAdhJYmc1mxxKzBUJTSF5HZizfrKrS6BzkA==
   dependencies:
     anymatch "^1.3.0"
     browserify "^16.1.0"
@@ -8345,20 +9661,29 @@ watchify@^3.11.0:
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
   dependencies:
     iconv-lite "0.4.24"
 
+whatwg-fetch@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
+  integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
+
 whatwg-mimetype@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.2.0.tgz#a3d58ef10b76009b042d03e25591ece89b88d171"
+  integrity sha512-5YSO1nMd5D1hY3WzAQV3PzZL83W3YeyR1yW9PcH26Weh1t+Vzh9B6XkDh7aXm83HBZ4nSMvkjvN2H2ySWIvBgw==
 
 whatwg-url@^6.4.1:
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
+  integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^1.0.1"
@@ -8367,6 +9692,7 @@ whatwg-url@^6.4.1:
 whatwg-url@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
+  integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^1.0.1"
@@ -8375,44 +9701,53 @@ whatwg-url@^7.0.0:
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
 which@1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
 win-release@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/win-release/-/win-release-1.1.1.tgz#5fa55e02be7ca934edfc12665632e849b72e5209"
+  integrity sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=
   dependencies:
     semver "^5.0.1"
 
 window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
+  integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -8420,10 +9755,12 @@ wrap-ansi@^2.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -8432,18 +9769,21 @@ write-file-atomic@^2.1.0:
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
   dependencies:
     mkdirp "^0.5.1"
 
 ws@^5.2.0:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
+  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
   dependencies:
     async-limiter "~1.0.0"
 
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
@@ -8452,10 +9792,12 @@ ws@~3.3.1:
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
 xml2js@^0.4.9:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
+  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
   dependencies:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
@@ -8463,34 +9805,42 @@ xml2js@^0.4.9:
 xml@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
 
 xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
 
 yargs-parser@^2.4.1:
   version "2.4.1"
   resolved "http://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4"
+  integrity sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=
   dependencies:
     camelcase "^3.0.0"
     lodash.assign "^4.0.6"
@@ -8498,24 +9848,28 @@ yargs-parser@^2.4.1:
 yargs-parser@^4.1.0, yargs-parser@^4.2.0:
   version "4.2.1"
   resolved "http://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+  integrity sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=
   dependencies:
     camelcase "^3.0.0"
 
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
   dependencies:
     camelcase "^3.0.0"
 
 yargs-parser@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+  integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=
   dependencies:
     camelcase "^4.1.0"
 
 yargs@6.4.0:
   version "6.4.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-6.4.0.tgz#816e1a866d5598ccf34e5596ddce22d92da490d4"
+  integrity sha1-gW4ahm1VmMzzTlWW3c4i2S2kkNQ=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -8535,6 +9889,7 @@ yargs@6.4.0:
 yargs@6.6.0:
   version "6.6.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+  integrity sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -8553,6 +9908,7 @@ yargs@6.6.0:
 yargs@^11.0.0:
   version "11.1.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
+  integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==
   dependencies:
     cliui "^4.0.0"
     decamelize "^1.1.1"
@@ -8570,6 +9926,7 @@ yargs@^11.0.0:
 yargs@^4.2.0:
   version "4.8.1"
   resolved "http://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"
+  integrity sha1-wMQpJMpKqmsObaFznfshZDn53cA=
   dependencies:
     cliui "^3.2.0"
     decamelize "^1.1.1"
@@ -8589,6 +9946,7 @@ yargs@^4.2.0:
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -8607,3 +9965,4 @@ yargs@^7.0.0:
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
index cb78c961a2..6b432e7237 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
@@ -5,6 +5,7 @@ import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.RevisionNotFoundException;
+import sonia.scm.repository.api.DiffFormat;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.util.HttpUtil;
@@ -57,6 +58,7 @@ public class DiffRootResource {
         try {
           repositoryService.getDiffCommand()
             .setRevision(revision)
+            .setFormat(DiffFormat.GIT) // TODO: Configure this at request time. Maybe as a query param?
             .retriveContent(output);
         } catch (RevisionNotFoundException e) {
           throw new WebApplicationException(Response.Status.NOT_FOUND);

From bf1effb9c0939205fb646196ce6eb130a09829ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 18 Oct 2018 16:08:49 +0200
Subject: [PATCH 009/188] Remove special RepositoryNotFoundException

---
 .../java/sonia/scm/NotFoundException.java     | 26 ++++---
 .../RepositoryNotFoundException.java          | 68 -------------------
 .../api/RepositoryServiceFactory.java         |  8 +--
 .../scm/repository/spi/HookEventFacade.java   | 10 +--
 .../sonia/scm/web/HgHookCallbackServlet.java  | 14 ++--
 .../api/v2/resources/BranchRootResource.java  |  7 +-
 .../v2/resources/ChangesetRootResource.java   |  1 -
 .../scm/api/v2/resources/ContentResource.java |  1 -
 .../v2/resources/FileHistoryRootResource.java |  1 -
 .../v2/resources/PermissionRootResource.java  |  9 ++-
 .../api/v2/resources/SourceRootResource.java  |  1 -
 .../scm/api/v2/resources/TagRootResource.java |  1 -
 .../repository/DefaultRepositoryManager.java  |  4 +-
 .../sonia/scm/repository/HealthChecker.java   |  2 +-
 .../scm/web/protocol/HttpProtocolServlet.java |  6 +-
 .../api/v2/resources/ContentResourceTest.java |  3 +-
 .../api/v2/resources/DiffResourceTest.java    |  3 +-
 .../v2/resources/FileHistoryResourceTest.java |  3 +-
 .../v2/resources/SourceRootResourceTest.java  | 10 +--
 .../DefaultRepositoryManagerTest.java         |  4 +-
 .../web/protocol/HttpProtocolServletTest.java |  8 +--
 21 files changed, 56 insertions(+), 134 deletions(-)
 delete mode 100644 scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java

diff --git a/scm-core/src/main/java/sonia/scm/NotFoundException.java b/scm-core/src/main/java/sonia/scm/NotFoundException.java
index 929fa617ad..d562a674bb 100644
--- a/scm-core/src/main/java/sonia/scm/NotFoundException.java
+++ b/scm-core/src/main/java/sonia/scm/NotFoundException.java
@@ -1,5 +1,6 @@
 package sonia.scm;
 
+import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 
 import java.util.Collections;
@@ -25,14 +26,20 @@ public class NotFoundException extends RuntimeException {
     this.context = context;
   }
 
+  public static NotFoundExceptionBuilder notFound(Repository repository) {
+    return new NotFoundExceptionBuilder().in(repository);
+  }
+
+  public static NotFoundExceptionBuilder notFound(NamespaceAndName namespaceAndName) {
+    return new NotFoundExceptionBuilder().in(namespaceAndName);
+  }
+
   public static NotFoundExceptionBuilder notFound(Class type, String id) {
-    NotFoundExceptionBuilder builder = new NotFoundExceptionBuilder();
-    return builder.in(type, id);
+    return new NotFoundExceptionBuilder().in(type, id);
   }
 
   public static NotFoundExceptionBuilder notFound(String type, String id) {
-    NotFoundExceptionBuilder builder = new NotFoundExceptionBuilder();
-    return builder.in(type, id);
+    return new NotFoundExceptionBuilder().in(type, id);
   }
 
   public List<ContextEntry> getContext() {
@@ -50,17 +57,20 @@ public class NotFoundException extends RuntimeException {
     private final List<ContextEntry> context = new LinkedList<>();
 
     public NotFoundExceptionBuilder in(Repository repository) {
-      this.in(Repository.class, repository.getNamespaceAndName().logString());
-      return this;
+      return in(repository.getNamespaceAndName());
+    }
+
+    public NotFoundExceptionBuilder in(NamespaceAndName namespaceAndName) {
+      return this.in(Repository.class, namespaceAndName.logString());
     }
 
     public NotFoundExceptionBuilder in(Class type, String id) {
-      this.context.add(new ContextEntry(type, id));
+      context.add(new ContextEntry(type, id));
       return this;
     }
 
     public NotFoundExceptionBuilder in(String type, String id) {
-      this.context.add(new ContextEntry(type, id));
+      context.add(new ContextEntry(type, id));
       return this;
     }
 
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java
deleted file mode 100644
index 9863aeddd3..0000000000
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.repository;
-
-import sonia.scm.NotFoundException;
-
-/**
- * Signals that the specified {@link Repository} could be found.
- *
- * @author Sebastian Sdorra
- * @since 1.6
- */
-public class RepositoryNotFoundException extends NotFoundException
-{
-
-  private static final long serialVersionUID = -6583078808900520166L;
-  private static final String TYPE_REPOSITORY = "Repository";
-
-  //~--- constructors ---------------------------------------------------------
-
-  /**
-   * Constructs a new {@link RepositoryNotFoundException} with null as its 
-   * error detail message.
-   *
-   */
-  public RepositoryNotFoundException(Repository repository) {
-    super(Repository.class, repository.getNamespaceAndName().logString());
-  }
-
-  public RepositoryNotFoundException(String repositoryId) {
-    super(TYPE_REPOSITORY, repositoryId);
-  }
-
-  public RepositoryNotFoundException(NamespaceAndName namespaceAndName) {
-    super(Repository.class, namespaceAndName.logString());
-  }
-}
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
index 7160c2723d..4a53dbb449 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
@@ -38,13 +38,13 @@ package sonia.scm.repository.api;
 import com.github.legman.ReferenceType;
 import com.github.legman.Subscribe;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.HandlerEventType;
+import sonia.scm.NotFoundException;
 import sonia.scm.cache.Cache;
 import sonia.scm.cache.CacheManager;
 import sonia.scm.config.ScmConfiguration;
@@ -57,7 +57,6 @@ import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryCacheKeyPredicate;
 import sonia.scm.repository.RepositoryEvent;
 import sonia.scm.repository.RepositoryManager;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.repository.spi.RepositoryServiceProvider;
 import sonia.scm.repository.spi.RepositoryServiceResolver;
@@ -161,7 +160,7 @@ public final class RepositoryServiceFactory
    * @return a implementation of RepositoryService
    *         for the given type of repository
    *
-   * @throws RepositoryNotFoundException if no repository
+   * @throws NotFoundException if no repository
    *         with the given id is available
    * @throws RepositoryServiceNotFoundException if no repository service
    *         implementation for this kind of repository is available
@@ -170,7 +169,6 @@ public final class RepositoryServiceFactory
    *         for that repository
    */
   public RepositoryService create(NamespaceAndName namespaceAndName)
-    throws RepositoryNotFoundException
   {
     Preconditions.checkArgument(namespaceAndName != null,
       "a non empty namespace and name is required");
@@ -179,7 +177,7 @@ public final class RepositoryServiceFactory
 
     if (repository == null)
     {
-      throw new RepositoryNotFoundException(namespaceAndName);
+      throw NotFoundException.notFound(namespaceAndName).build();
     }
 
     return create(repository);
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/HookEventFacade.java b/scm-core/src/main/java/sonia/scm/repository/spi/HookEventFacade.java
index 52ef68f272..359b068655 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/HookEventFacade.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/HookEventFacade.java
@@ -35,12 +35,12 @@ package sonia.scm.repository.spi;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
+import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryHookEvent;
 import sonia.scm.repository.RepositoryHookType;
 import sonia.scm.repository.RepositoryManager;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.api.HookContext;
 import sonia.scm.repository.api.HookContextFactory;
 
@@ -71,18 +71,18 @@ public final class HookEventFacade
 
   //~--- methods --------------------------------------------------------------
 
-  public HookEventHandler handle(String id) throws RepositoryNotFoundException {
+  public HookEventHandler handle(String id) {
     return handle(repositoryManagerProvider.get().get(id));
   }
 
-  public HookEventHandler handle(NamespaceAndName namespaceAndName) throws RepositoryNotFoundException {
+  public HookEventHandler handle(NamespaceAndName namespaceAndName) {
     return handle(repositoryManagerProvider.get().get(namespaceAndName));
   }
 
-  public HookEventHandler handle(Repository repository) throws RepositoryNotFoundException {
+  public HookEventHandler handle(Repository repository) {
     if (repository == null)
     {
-      throw new RepositoryNotFoundException(repository);
+      throw NotFoundException.notFound(repository).build();
     }
 
     return new HookEventHandler(repositoryManagerProvider.get(),
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java
index 2734996686..25a368d25b 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java
@@ -44,11 +44,11 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sonia.scm.NotFoundException;
 import sonia.scm.repository.HgContext;
 import sonia.scm.repository.HgHookManager;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.RepositoryHookType;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.RepositoryUtil;
 import sonia.scm.repository.api.HgHookMessage;
 import sonia.scm.repository.api.HgHookMessage.Severity;
@@ -275,17 +275,11 @@ public class HgHookCallbackServlet extends HttpServlet
 
       printMessages(response, context);
     }
-    catch (RepositoryNotFoundException ex)
+    catch (NotFoundException ex)
     {
-      if (logger.isErrorEnabled())
-      {
-        logger.error("could not find repository with id {}", id);
+      logger.error(ex.getMessage());
 
-        if (logger.isTraceEnabled())
-        {
-          logger.trace("repository not found", ex);
-        }
-      }
+      logger.trace("repository not found", ex);
 
       response.sendError(HttpServletResponse.SC_NOT_FOUND);
     }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java
index e308aeda25..2c0338309c 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java
@@ -11,7 +11,6 @@ import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.repository.api.CommandNotSupportedException;
 import sonia.scm.repository.api.RepositoryService;
@@ -78,7 +77,7 @@ public class BranchRootResource {
         .build();
     } catch (CommandNotSupportedException ex) {
       return Response.status(Response.Status.BAD_REQUEST).build();
-    } catch (RepositoryNotFoundException e) {
+    } catch (NotFoundException e) {
       return Response.status(Response.Status.NOT_FOUND).build();
     }
   }
@@ -98,7 +97,7 @@ public class BranchRootResource {
                           @PathParam("name") String name,
                           @PathParam("branch") String branchName,
                           @DefaultValue("0") @QueryParam("page") int page,
-                          @DefaultValue("10") @QueryParam("pageSize") int pageSize) throws Exception {
+                          @DefaultValue("10") @QueryParam("pageSize") int pageSize) throws IOException {
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
       boolean branchExists = repositoryService.getBranchesCommand()
         .getBranches()
@@ -151,8 +150,6 @@ public class BranchRootResource {
       return Response.ok(branchCollectionToDtoMapper.map(namespace, name, branches.getBranches())).build();
     } catch (CommandNotSupportedException ex) {
       return Response.status(Response.Status.BAD_REQUEST).build();
-    } catch (RepositoryNotFoundException e) {
-      return Response.status(Response.Status.NOT_FOUND).build();
     }
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java
index bae521ae4c..dc33d57ce9 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java
@@ -9,7 +9,6 @@ import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java
index 9680a319a5..da5a8a4a0a 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java
@@ -8,7 +8,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.util.IOUtil;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java
index ae4bcb1064..faa7f4975c 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java
@@ -10,7 +10,6 @@ import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.web.VndMediaType;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
index 71f0e03516..4b088a62a5 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
@@ -11,7 +11,6 @@ import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Permission;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryManager;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.web.VndMediaType;
 
@@ -131,7 +130,7 @@ public class PermissionRootResource {
   @Produces(VndMediaType.PERMISSION)
   @TypeHint(PermissionDto.class)
   @Path("")
-  public Response getAll(@PathParam("namespace") String namespace, @PathParam("name") String name) throws RepositoryNotFoundException {
+  public Response getAll(@PathParam("namespace") String namespace, @PathParam("name") String name) {
     Repository repository = load(namespace, name);
     RepositoryPermissions.permissionRead(repository).check();
     return Response.ok(permissionCollectionToDtoMapper.map(repository)).build();
@@ -237,12 +236,12 @@ public class PermissionRootResource {
    * @param namespace the repository namespace
    * @param name      the repository name
    * @return the repository if the user is permitted
-   * @throws RepositoryNotFoundException if the repository does not exists
+   * @throws NotFoundException if the repository does not exists
    */
-  private Repository load(String namespace, String name) throws RepositoryNotFoundException {
+  private Repository load(String namespace, String name) {
     NamespaceAndName namespaceAndName = new NamespaceAndName(namespace, name);
     return Optional.ofNullable(manager.get(namespaceAndName))
-      .orElseThrow(() -> new RepositoryNotFoundException(namespaceAndName));
+      .orElseThrow(() -> NotFoundException.notFound(namespaceAndName).build());
   }
 
   /**
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java
index 42be4daf89..01a25f461c 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SourceRootResource.java
@@ -2,7 +2,6 @@ package sonia.scm.api.v2.resources;
 
 import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.api.BrowseCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java
index 6b4f8b2f96..632c428e62 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java
@@ -6,7 +6,6 @@ import com.webcohesion.enunciate.metadata.rs.TypeHint;
 import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.repository.Tag;
 import sonia.scm.repository.Tags;
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
index c2e8bc3ad8..dc4767e024 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
@@ -198,7 +198,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
   }
 
   @Override
-  public void refresh(Repository repository) throws RepositoryNotFoundException {
+  public void refresh(Repository repository) {
     AssertUtil.assertIsNotNull(repository);
     RepositoryPermissions.read(repository).check();
 
@@ -207,7 +207,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
     if (fresh != null) {
       fresh.copyProperties(repository);
     } else {
-      throw new RepositoryNotFoundException(repository);
+      throw NotFoundException.notFound(repository).build();
     }
   }
 
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/HealthChecker.java b/scm-webapp/src/main/java/sonia/scm/repository/HealthChecker.java
index e9c415c4fa..61d488d641 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/HealthChecker.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/HealthChecker.java
@@ -61,7 +61,7 @@ public final class HealthChecker {
     Repository repository = repositoryManager.get(id);
 
     if (repository == null) {
-      throw new RepositoryNotFoundException(id);
+      throw new NotFoundException(Repository.class, id);
     }
 
     doCheck(repository);
diff --git a/scm-webapp/src/main/java/sonia/scm/web/protocol/HttpProtocolServlet.java b/scm-webapp/src/main/java/sonia/scm/web/protocol/HttpProtocolServlet.java
index bc085d2cc7..c6a96e4b9e 100644
--- a/scm-webapp/src/main/java/sonia/scm/web/protocol/HttpProtocolServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/web/protocol/HttpProtocolServlet.java
@@ -4,11 +4,11 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
+import sonia.scm.NotFoundException;
 import sonia.scm.PushStateDispatcher;
 import sonia.scm.filter.WebElement;
 import sonia.scm.repository.DefaultRepositoryProvider;
 import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.repository.spi.HttpScmProtocol;
@@ -71,8 +71,8 @@ public class HttpProtocolServlet extends HttpServlet {
       requestProvider.get().setAttribute(DefaultRepositoryProvider.ATTRIBUTE_NAME, repositoryService.getRepository());
       HttpScmProtocol protocol = repositoryService.getProtocol(HttpScmProtocol.class);
       protocol.serve(req, resp, getServletConfig());
-    } catch (RepositoryNotFoundException e) {
-      log.debug("Repository not found for namespace and name {}", namespaceAndName, e);
+    } catch (NotFoundException e) {
+      log.debug(e.getMessage());
       resp.setStatus(HttpStatus.SC_NOT_FOUND);
     }
   }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java
index bb7b0e5458..1ad0aad435 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java
@@ -10,7 +10,6 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.api.CatCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
@@ -58,7 +57,7 @@ public class ContentResourceTest {
     when(catCommand.setRevision(REV)).thenReturn(catCommand);
 
     // defaults for unknown things
-    doThrow(new RepositoryNotFoundException("x")).when(repositoryServiceFactory).create(not(eq(existingNamespaceAndName)));
+    doThrow(new NotFoundException("Test", "r")).when(repositoryServiceFactory).create(not(eq(existingNamespaceAndName)));
     doThrow(new NotFoundException("Test", "X")).when(catCommand).getStream(any());
   }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
index 406547b951..e762e5d186 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
@@ -21,7 +21,6 @@ import sonia.scm.NotFoundException;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.api.DiffCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
@@ -107,7 +106,7 @@ public class DiffResourceTest extends RepositoryTestBase {
   }
 
   @Test
-  public void shouldGet404OnMissingRepository() throws URISyntaxException, RepositoryNotFoundException {
+  public void shouldGet404OnMissingRepository() throws URISyntaxException {
     when(serviceFactory.create(any(NamespaceAndName.class))).thenThrow(new NotFoundException("Text", "x"));
     MockHttpRequest request = MockHttpRequest
       .get(DIFF_URL + "revision")
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
index 4f00f9ba5b..322995eaa7 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
@@ -26,7 +26,6 @@ import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.api.LogCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
@@ -133,7 +132,7 @@ public class FileHistoryResourceTest extends RepositoryTestBase {
 
 
   @Test
-  public void shouldGet404OnMissingRepository() throws URISyntaxException, RepositoryNotFoundException {
+  public void shouldGet404OnMissingRepository() throws URISyntaxException {
     when(serviceFactory.create(any(NamespaceAndName.class))).thenThrow(new NotFoundException("Text", "x"));
     MockHttpRequest request = MockHttpRequest
       .get(FILE_HISTORY_URL + "revision/a.txt")
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
index cca7493162..311bff194a 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
@@ -10,10 +10,10 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import sonia.scm.NotFoundException;
 import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.FileObject;
 import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.api.BrowseCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
@@ -81,8 +81,8 @@ public class SourceRootResourceTest extends RepositoryTestBase {
   }
 
   @Test
-  public void shouldReturn404IfRepoNotFound() throws URISyntaxException, RepositoryNotFoundException {
-    when(serviceFactory.create(new NamespaceAndName("idont", "exist"))).thenThrow(new RepositoryNotFoundException("abc"));
+  public void shouldReturn404IfRepoNotFound() throws URISyntaxException {
+    when(serviceFactory.create(new NamespaceAndName("idont", "exist"))).thenThrow(new NotFoundException("Test", "a"));
     MockHttpRequest request = MockHttpRequest.get("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "idont/exist/sources");
     MockHttpResponse response = new MockHttpResponse();
 
@@ -109,8 +109,8 @@ public class SourceRootResourceTest extends RepositoryTestBase {
   }
 
   @Test
-  public void shouldGet404ForSingleFileIfRepoNotFound() throws URISyntaxException, RepositoryNotFoundException {
-    when(serviceFactory.create(new NamespaceAndName("idont", "exist"))).thenThrow(new RepositoryNotFoundException("abc"));
+  public void shouldGet404ForSingleFileIfRepoNotFound() throws URISyntaxException {
+    when(serviceFactory.create(new NamespaceAndName("idont", "exist"))).thenThrow(new NotFoundException("Test", "a"));
 
     MockHttpRequest request = MockHttpRequest.get("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "idont/exist/sources/revision/fileabc");
     MockHttpResponse response = new MockHttpResponse();
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
index 4a28c3bc83..8876903637 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
@@ -353,7 +353,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
     manager.refresh(heartOfGold);
   }
 
-  @Test(expected = RepositoryNotFoundException.class)
+  @Test(expected = NotFoundException.class)
   public void testRefreshNotFound(){
     manager.refresh(createRepositoryWithId());
   }
@@ -383,7 +383,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
     RepositoryManager repoManager = createRepositoryManager(false);
     Repository repository = spy(createTestRepository());
     repository.setName("Testrepo");
-    ((DefaultRepositoryManager) repoManager).create(repository);
+    repoManager.create(repository);
     assertEquals("default_namespace", repository.getNamespace());
   }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/web/protocol/HttpProtocolServletTest.java b/scm-webapp/src/test/java/sonia/scm/web/protocol/HttpProtocolServletTest.java
index c22491d045..1bd6358c95 100644
--- a/scm-webapp/src/test/java/sonia/scm/web/protocol/HttpProtocolServletTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/web/protocol/HttpProtocolServletTest.java
@@ -4,11 +4,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import sonia.scm.NotFoundException;
 import sonia.scm.PushStateDispatcher;
 import sonia.scm.repository.DefaultRepositoryProvider;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.repository.spi.HttpScmProtocol;
@@ -58,12 +58,12 @@ public class HttpProtocolServletTest {
   private HttpScmProtocol protocol;
 
   @Before
-  public void init() throws RepositoryNotFoundException {
+  public void init() {
     initMocks(this);
     when(userAgentParser.parse(request)).thenReturn(userAgent);
     when(userAgent.isBrowser()).thenReturn(false);
     NamespaceAndName existingRepo = new NamespaceAndName("space", "repo");
-    when(serviceFactory.create(not(eq(existingRepo)))).thenThrow(new RepositoryNotFoundException("x"));
+    when(serviceFactory.create(not(eq(existingRepo)))).thenThrow(new NotFoundException("Test", "a"));
     when(serviceFactory.create(existingRepo)).thenReturn(repositoryService);
     when(requestProvider.get()).thenReturn(httpServletRequest);
   }
@@ -97,7 +97,7 @@ public class HttpProtocolServletTest {
   }
 
   @Test
-  public void shouldDelegateToProvider() throws RepositoryNotFoundException, IOException, ServletException {
+  public void shouldDelegateToProvider() throws IOException, ServletException {
     when(request.getPathInfo()).thenReturn("/space/name");
     NamespaceAndName namespaceAndName = new NamespaceAndName("space", "name");
     doReturn(repositoryService).when(serviceFactory).create(namespaceAndName);

From db7e3b0d2edc6024dab73a37e79cb575ad6d9f29 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Fri, 19 Oct 2018 10:22:21 +0200
Subject: [PATCH 010/188] Moved DiffView into ChangesetDetails

---
 .../components/changesets/ChangesetDetails.js |  3 ++
 .../containers/{ScmDiff.js => DiffView.js}    | 31 +++----------------
 scm-ui/src/repos/containers/RepositoryRoot.js | 19 ------------
 3 files changed, 7 insertions(+), 46 deletions(-)
 rename scm-ui/src/repos/containers/{ScmDiff.js => DiffView.js} (52%)

diff --git a/scm-ui/src/repos/components/changesets/ChangesetDetails.js b/scm-ui/src/repos/components/changesets/ChangesetDetails.js
index b93c72805b..26c3120bb8 100644
--- a/scm-ui/src/repos/components/changesets/ChangesetDetails.js
+++ b/scm-ui/src/repos/components/changesets/ChangesetDetails.js
@@ -12,6 +12,7 @@ import AvatarImage from "./AvatarImage";
 import classNames from "classnames";
 import ChangesetId from "./ChangesetId";
 import type {Tag} from "@scm-manager/ui-types";
+import DiffView from "../../containers/DiffView";
 
 const styles = {
   spacing: {
@@ -70,6 +71,8 @@ class ChangesetDetails extends React.Component<Props> {
             );
           })}
         </p>
+
+        <DiffView changeset={changeset} sideBySide={false} />
       </div>
     );
   }
diff --git a/scm-ui/src/repos/containers/ScmDiff.js b/scm-ui/src/repos/containers/DiffView.js
similarity index 52%
rename from scm-ui/src/repos/containers/ScmDiff.js
rename to scm-ui/src/repos/containers/DiffView.js
index c1f82af512..cd26e74ee6 100644
--- a/scm-ui/src/repos/containers/ScmDiff.js
+++ b/scm-ui/src/repos/containers/DiffView.js
@@ -1,15 +1,12 @@
 // @flow
 
 import React from "react";
-import { Diff, Hunk, parseDiff } from "react-diff-view";
 import { apiClient } from "@scm-manager/ui-components";
-import type { Repository } from "@scm-manager/ui-types";
+import type { Changeset } from "@scm-manager/ui-types";
 import { Diff2Html } from "diff2html";
 
 type Props = {
-  //TODO: Actually, we want the Changeset here
-  repository: Repository,
-  revision: string,
+  changeset: Changeset,
   sideBySide: boolean
 };
 
@@ -25,9 +22,8 @@ class ScmDiff extends React.Component<Props, State> {
   }
 
   componentDidMount() {
-    const { repository, revision } = this.props;
-    const { namespace, name } = repository;
-    const url = `/repositories/${namespace}/${name}/diff/${revision}`; //TODO: use HATEOAS link from changeset
+    const { changeset } = this.props;
+    const url = changeset._links.diff.href;
     apiClient
       .get(url)
       .then(response => response.text())
@@ -49,25 +45,6 @@ class ScmDiff extends React.Component<Props, State> {
       // eslint-disable-next-line react/no-danger
       <div dangerouslySetInnerHTML={{ __html: outputHtml }} />
     );
-    // if (!this.state.diff) {
-    //   return null;
-    // }
-    //
-    // const files = parseDiff(this.state.diff);
-    //
-    // const renderFile = ({ newPath, oldRevision, newRevision, type, hunks }) => (
-    //   <div>
-    //     <div> File: {newPath} </div>
-    //     <Diff
-    //       key={oldRevision + "-" + newRevision}
-    //       diffType={type}
-    //       hunks={hunks}
-    //       viewType="unified"
-    //     />
-    //   </div>
-    // );
-    //
-    // return <div>{files.map(renderFile)}</div>;
   }
 }
 
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index 99ab55441a..43171bce94 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -19,7 +19,6 @@ import EditNavLink from "../components/EditNavLink";
 import BranchRoot from "./BranchRoot";
 import ChangesetView from "./ChangesetView";
 import PermissionsNavLink from "../components/PermissionsNavLink";
-import ScmDiff from "./ScmDiff";
 
 type Props = {
   namespace: string,
@@ -64,11 +63,6 @@ class RepositoryRoot extends React.Component<Props> {
     this.props.deleteRepo(repository, this.deleted);
   };
 
-  matchChangeset = (route: any) => {
-    const url = this.matchedUrl();
-    return route.location.pathname.match(`${url}/changeset/`);
-  };
-
   matches = (route: any) => {
     const url = this.matchedUrl();
     const regex = new RegExp(`${url}(/branches)?/?[^/]*/changesets?.*`);
@@ -141,16 +135,6 @@ class RepositoryRoot extends React.Component<Props> {
                   />
                 )}
               />
-              <Route
-                path={`${url}/diff`}
-                component={() => (
-                  <ScmDiff
-                    repository={repository}
-                    revision={"a801749dc445d9d71e3fe4c50241433a2adfba6a"} // TODO: this is hardcoded only for dev purposes.
-                    sideBySide={false}
-                  />
-                )}
-              />
             </Switch>
           </div>
           <div className="column">
@@ -173,9 +157,6 @@ class RepositoryRoot extends React.Component<Props> {
                 <DeleteNavAction repository={repository} delete={this.delete} />
                 <NavLink to="/repos" label={t("repository-root.back-label")} />
               </Section>
-              <Section label="Diff">
-                <NavLink to={`${url}/diff`} label="Diff" />
-              </Section>
             </Navigation>
           </div>
         </div>

From f684a074042e44bfaff21214e8def4d88b40d7a8 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 23 Oct 2018 15:47:20 +0200
Subject: [PATCH 011/188] update legman to version 1.4.0 to fix conflict with
 guava version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index df49023265..383ed6186d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -757,7 +757,7 @@
     <guice.version>4.0</guice.version>
 
     <!-- event bus -->
-    <legman.version>1.3.0</legman.version>
+    <legman.version>1.4.0</legman.version>
 
     <!-- webserver -->
     <jetty.version>9.2.10.v20150310</jetty.version>

From 4823232ff0eacc21912c1563ee2fe6a94fedb217 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 23 Oct 2018 16:28:53 +0200
Subject: [PATCH 012/188] added RestartServlet, which is able to trigger a
 complete restart of the context

---
 .../main/java/sonia/scm/ResteasyModule.java   |  20 +++
 .../java/sonia/scm/ScmContextListener.java    |   1 +
 .../scm/boot/BootstrapContextFilter.java      |  43 +++---
 .../scm/boot/BootstrapContextListener.java    |  28 ----
 .../java/sonia/scm/boot/RestartServlet.java   |  97 +++++++++++++
 .../sonia/scm/boot/ServletContextCleaner.java |  59 ++++++++
 .../src/main/resources/logback.default.xml    |   7 +-
 scm-webapp/src/main/webapp/WEB-INF/web.xml    |  23 ---
 .../sonia/scm/boot/RestartServletTest.java    | 133 ++++++++++++++++++
 .../scm/boot/ServletContextCleanerTest.java   |  53 +++++++
 10 files changed, 389 insertions(+), 75 deletions(-)
 create mode 100644 scm-webapp/src/main/java/sonia/scm/ResteasyModule.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/boot/RestartServlet.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/boot/ServletContextCleaner.java
 create mode 100644 scm-webapp/src/test/java/sonia/scm/boot/RestartServletTest.java
 create mode 100644 scm-webapp/src/test/java/sonia/scm/boot/ServletContextCleanerTest.java

diff --git a/scm-webapp/src/main/java/sonia/scm/ResteasyModule.java b/scm-webapp/src/main/java/sonia/scm/ResteasyModule.java
new file mode 100644
index 0000000000..a85c3b6d06
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/ResteasyModule.java
@@ -0,0 +1,20 @@
+package sonia.scm;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.servlet.ServletModule;
+import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
+import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters;
+
+import javax.inject.Singleton;
+import java.util.Map;
+
+public class ResteasyModule extends ServletModule {
+
+  @Override
+  protected void configureServlets() {
+    bind(HttpServletDispatcher.class).in(Singleton.class);
+
+    Map<String, String> initParams = ImmutableMap.of(ResteasyContextParameters.RESTEASY_SERVLET_MAPPING_PREFIX, "/api");
+    serve("/api/*").with(HttpServletDispatcher.class, initParams);
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java b/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
index 5a087a1c70..8ae005e826 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
@@ -126,6 +126,7 @@ public class ScmContextListener extends GuiceResteasyBootstrapServletContextList
     ClassOverrides overrides = ClassOverrides.findOverrides(pluginLoader.getUberClassLoader());
     List<Module> moduleList = Lists.newArrayList();
 
+    moduleList.add(new ResteasyModule());
     moduleList.add(new ScmInitializerModule());
     moduleList.add(new ScmEventBusModule());
     moduleList.add(new EagerSingletonModule());
diff --git a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextFilter.java b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextFilter.java
index bfa2218e76..aec8e2d653 100644
--- a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextFilter.java
@@ -34,22 +34,19 @@ package sonia.scm.boot;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.github.legman.Subscribe;
-
 import com.google.inject.servlet.GuiceFilter;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sonia.scm.SCMContext;
 import sonia.scm.Stage;
 import sonia.scm.event.ScmEventBus;
 
-//~--- JDK imports ------------------------------------------------------------
-
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletException;
 
+//~--- JDK imports ------------------------------------------------------------
+
 /**
  *
  * @author Sebastian Sdorra
@@ -65,6 +62,8 @@ public class BootstrapContextFilter extends GuiceFilter
 
   //~--- methods --------------------------------------------------------------
 
+  private final BootstrapContextListener listener = new BootstrapContextListener();
+
   /**
    * Restart the whole webapp context.
    *
@@ -85,29 +84,20 @@ public class BootstrapContextFilter extends GuiceFilter
     }
     else
     {
-
-      logger.warn(
-        "destroy filter pipeline, because of a received restart event");
+      logger.warn("destroy filter pipeline, because of a received restart event");
       destroy();
-      logger.warn(
-        "reinitialize filter pipeline, because of a received restart event");
-      super.init(filterConfig);
+
+      logger.warn("reinitialize filter pipeline, because of a received restart event");
+      initGuice();
     }
   }
 
-  /**
-   * Method description
-   *
-   *
-   * @param filterConfig
-   *
-   * @throws ServletException
-   */
   @Override
   public void init(FilterConfig filterConfig) throws ServletException
   {
     this.filterConfig = filterConfig;
-    super.init(filterConfig);
+
+    initGuice();
 
     if (SCMContext.getContext().getStage() == Stage.DEVELOPMENT)
     {
@@ -116,6 +106,19 @@ public class BootstrapContextFilter extends GuiceFilter
     }
   }
 
+  public void initGuice() throws ServletException {
+    super.init(filterConfig);
+
+    listener.contextInitialized(new ServletContextEvent(filterConfig.getServletContext()));
+  }
+
+  @Override
+  public void destroy() {
+    super.destroy();
+    listener.contextDestroyed(new ServletContextEvent(filterConfig.getServletContext()));
+    ServletContextCleaner.cleanup(filterConfig.getServletContext());
+  }
+
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
diff --git a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
index bf7583b2a2..afaa28bfe8 100644
--- a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
@@ -187,40 +187,12 @@ public class BootstrapContextListener implements ServletContextListener
     return Boolean.getBoolean("sonia.scm.boot.disable-core-plugin-extraction");
   }
 
-  /**
-   * Restart the whole webapp context.
-   *
-   *
-   * @param event restart event
-   */
-  @Subscribe
-  public void handleRestartEvent(RestartEvent event)
-  {
-    logger.warn("received restart event from {} with reason: {}",
-      event.getCause(), event.getReason());
-
-    if (context == null)
-    {
-      logger.error("context is null, scm-manager is not initialized");
-    }
-    else
-    {
-      ServletContextEvent sce = new ServletContextEvent(context);
-
-      logger.warn("destroy context, because of a received restart event");
-      contextDestroyed(sce);
-      logger.warn("reinitialize context, because of a received restart event");
-      contextInitialized(sce);
-    }
-  }
-
   /**
    * Method description
    *
    *
    * @param context
    * @param pluginDirectory
-   * @param name
    * @param entry
    *
    * @throws IOException
diff --git a/scm-webapp/src/main/java/sonia/scm/boot/RestartServlet.java b/scm-webapp/src/main/java/sonia/scm/boot/RestartServlet.java
new file mode 100644
index 0000000000..c7177cc459
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/boot/RestartServlet.java
@@ -0,0 +1,97 @@
+package sonia.scm.boot;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sonia.scm.Priority;
+import sonia.scm.SCMContext;
+import sonia.scm.Stage;
+import sonia.scm.event.ScmEventBus;
+import sonia.scm.filter.WebElement;
+
+import javax.inject.Inject;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * This servlet sends a {@link RestartEvent} to the {@link ScmEventBus} which causes scm-manager to restart the context.
+ * The {@link RestartServlet} can be used for reloading java code or for installing plugins without a complete restart.
+ * At the moment the Servlet accepts only request, if scm-manager was started in the {@link Stage#DEVELOPMENT} stage.
+ *
+ * @since 2.0.0
+ */
+@Priority(0)
+@WebElement("/restart")
+public class RestartServlet extends HttpServlet {
+
+  private static final Logger LOG = LoggerFactory.getLogger(RestartServlet.class);
+
+  private final ObjectMapper objectMapper = new ObjectMapper();
+  private final AtomicBoolean restarting = new AtomicBoolean();
+
+  private final ScmEventBus eventBus;
+  private final Stage stage;
+
+  @Inject
+  public RestartServlet() {
+    this(ScmEventBus.getInstance(), SCMContext.getContext().getStage());
+  }
+
+  RestartServlet(ScmEventBus eventBus, Stage stage) {
+    this.eventBus = eventBus;
+    this.stage = stage;
+  }
+
+  @Override
+  protected void doPost(HttpServletRequest req, HttpServletResponse resp) {
+    LOG.info("received sendRestartEvent request");
+
+    if (isRestartAllowed()) {
+
+      try (InputStream requestInput = req.getInputStream()) {
+        Reason reason = objectMapper.readValue(requestInput, Reason.class);
+        sendRestartEvent(resp, reason);
+      } catch (IOException ex) {
+        LOG.warn("failed to trigger sendRestartEvent event", ex);
+        resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+      }
+
+    } else {
+      LOG.debug("received restart event in non development stage");
+      resp.setStatus(HttpServletResponse.SC_NOT_ACCEPTABLE);
+    }
+  }
+
+  private boolean isRestartAllowed() {
+    return stage == Stage.DEVELOPMENT;
+  }
+
+  private void sendRestartEvent(HttpServletResponse response, Reason reason) {
+    if ( restarting.compareAndSet(false, true) ) {
+      LOG.info("trigger sendRestartEvent, because of {}", reason.getMessage());
+      eventBus.post(new RestartEvent(RestartServlet.class, reason.getMessage()));
+
+      response.setStatus(HttpServletResponse.SC_ACCEPTED);
+    } else {
+      LOG.warn("scm-manager restarts already");
+      response.setStatus(HttpServletResponse.SC_CONFLICT);
+    }
+  }
+
+  public static class Reason {
+
+    private String message;
+
+    public void setMessage(String message) {
+      this.message = message;
+    }
+
+    public String getMessage() {
+      return message;
+    }
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/boot/ServletContextCleaner.java b/scm-webapp/src/main/java/sonia/scm/boot/ServletContextCleaner.java
new file mode 100644
index 0000000000..8b152ce329
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/boot/ServletContextCleaner.java
@@ -0,0 +1,59 @@
+package sonia.scm.boot;
+
+import com.google.common.collect.ImmutableSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.ServletContext;
+import java.util.Enumeration;
+import java.util.Set;
+
+/**
+ * Remove cached resources from {@link ServletContext} to allow a clean restart of scm-manager without stale or
+ * duplicated data.
+ *
+ * @since 2.0.0
+ */
+final class ServletContextCleaner {
+
+  private static final Logger LOG = LoggerFactory.getLogger(ServletContextCleaner.class);
+
+  private static final Set<String> REMOVE_PREFIX = ImmutableSet.of(
+    "org.jboss.resteasy",
+    "resteasy",
+    "org.apache.shiro",
+    "sonia.scm"
+  );
+
+  private ServletContextCleaner() {
+  }
+
+  /**
+   * Remove cached attributes from {@link ServletContext}.
+   *
+   * @param servletContext servlet context
+   */
+  static void cleanup(ServletContext servletContext) {
+    LOG.info("remove cached attributes from context");
+
+    Enumeration<String> attributeNames = servletContext.getAttributeNames();
+    while( attributeNames.hasMoreElements()) {
+      String name = attributeNames.nextElement();
+      if (shouldRemove(name)) {
+        LOG.info("remove attribute {} from servlet context", name);
+        servletContext.removeAttribute(name);
+      } else {
+        LOG.info("keep attribute {} in servlet context", name);
+      }
+    }
+  }
+
+  private static boolean shouldRemove(String name) {
+    for (String prefix : REMOVE_PREFIX) {
+      if (name.startsWith(prefix)) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
diff --git a/scm-webapp/src/main/resources/logback.default.xml b/scm-webapp/src/main/resources/logback.default.xml
index 33e914d04d..b12b9e0890 100644
--- a/scm-webapp/src/main/resources/logback.default.xml
+++ b/scm-webapp/src/main/resources/logback.default.xml
@@ -65,9 +65,6 @@
   <logger name="sonia.scm.event.LegmanScmEventBus" level="DEBUG" />
   <logger name="sonia.scm.plugin.ext.DefaultAnnotationScanner" level="INFO" />
   <logger name="sonia.scm.security.ConfigurableLoginAttemptHandler" level="DEBUG" />
-  
-  <!-- event bus -->
-  <logger name="sonia.scm.event.LegmanScmEventBus" level="INFO" />
 
   <!-- cgi -->
   <logger name="sonia.scm.web.cgi.DefaultCGIExecutor" level="DEBUG" />
@@ -93,7 +90,9 @@
   <logger name="net.sf.ehcache" level="DEBUG" />
   -->
   
-  <logger name="org.jboss.resteasy" level="DEBUG" />
+  <logger name="org.jboss.resteasy" level="INFO" />
+
+  <logger name="sonia.scm.boot.RestartServlet" level="TRACE" />
 
   <root level="WARN">
     <appender-ref ref="STDOUT" />
diff --git a/scm-webapp/src/main/webapp/WEB-INF/web.xml b/scm-webapp/src/main/webapp/WEB-INF/web.xml
index 8abba66aa3..e69eb9fb2a 100644
--- a/scm-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/scm-webapp/src/main/webapp/WEB-INF/web.xml
@@ -41,10 +41,6 @@
 
   <!-- bootstraping -->
 
-  <listener>
-    <listener-class>sonia.scm.boot.BootstrapContextListener</listener-class>
-  </listener>
-
   <filter>
     <filter-name>BootstrapFilter</filter-name>
     <filter-class>sonia.scm.boot.BootstrapContextFilter</filter-class>
@@ -55,25 +51,6 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
   
-  <!-- rest -->
-  
-  <context-param>
-    <param-name>resteasy.servlet.mapping.prefix</param-name>
-    <param-value>/api</param-value>
-  </context-param>
-
-  <servlet>
-    <servlet-name>Resteasy</servlet-name>
-    <servlet-class>
-      org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher
-    </servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>Resteasy</servlet-name>
-    <url-pattern>/api/*</url-pattern>
-  </servlet-mapping>
-  
   <!-- capture sessions -->
   <!-- 
   TODO remove, we need no longer a session
diff --git a/scm-webapp/src/test/java/sonia/scm/boot/RestartServletTest.java b/scm-webapp/src/test/java/sonia/scm/boot/RestartServletTest.java
new file mode 100644
index 0000000000..b8b538c82b
--- /dev/null
+++ b/scm-webapp/src/test/java/sonia/scm/boot/RestartServletTest.java
@@ -0,0 +1,133 @@
+package sonia.scm.boot;
+
+import com.github.legman.Subscribe;
+import com.google.common.base.Charsets;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import sonia.scm.Stage;
+import sonia.scm.event.ScmEventBus;
+import sonia.scm.event.ScmTestEventBus;
+
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RestartServletTest {
+
+  @Mock
+  private HttpServletRequest request;
+
+  @Mock
+  private HttpServletResponse response;
+
+  private RestartServlet restartServlet;
+
+  private EventListener listener;
+
+  private void setUpObjectUnderTest(Stage stage) {
+    listener = new EventListener();
+    ScmEventBus eventBus = ScmTestEventBus.getInstance();
+    eventBus.register(listener);
+
+    restartServlet = new RestartServlet(eventBus, stage);
+  }
+
+  @Test
+  public void testRestart() throws IOException {
+    setUpObjectUnderTest(Stage.DEVELOPMENT);
+    setRequestInputReason("something changed");
+
+    restartServlet.doPost(request, response);
+
+    verify(response).setStatus(HttpServletResponse.SC_ACCEPTED);
+
+    RestartEvent restartEvent = listener.restartEvent;
+    assertThat(restartEvent).isNotNull();
+    assertThat(restartEvent.getCause()).isEqualTo(RestartServlet.class);
+    assertThat(restartEvent.getReason()).isEqualTo("something changed");
+  }
+
+  @Test
+  public void testRestartCalledTwice() throws IOException {
+    setUpObjectUnderTest(Stage.DEVELOPMENT);
+
+    setRequestInputReason("initial change");
+    restartServlet.doPost(request, response);
+    verify(response).setStatus(HttpServletResponse.SC_ACCEPTED);
+
+    setRequestInputReason("changed again");
+    restartServlet.doPost(request, response);
+    verify(response).setStatus(HttpServletResponse.SC_CONFLICT);
+  }
+
+  @Test
+  public void testRestartWithInvalidContent() throws IOException {
+    setUpObjectUnderTest(Stage.DEVELOPMENT);
+
+    setRequestInputContent("invalid json");
+
+    restartServlet.doPost(request, response);
+
+    verify(response).setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+  }
+
+  @Test
+  public void testRestartInProductionStage() throws IOException {
+    setUpObjectUnderTest(Stage.PRODUCTION);
+
+    setRequestInputReason("initial change");
+
+    restartServlet.doPost(request, response);
+
+    verify(response).setStatus(HttpServletResponse.SC_NOT_ACCEPTABLE);
+  }
+
+  private void setRequestInputReason(String message) throws IOException {
+    String content = createReason(message);
+    setRequestInputContent(content);
+  }
+
+  private void setRequestInputContent(String content) throws IOException {
+    InputStream input = createReasonAsInputStream(content);
+    when(request.getInputStream()).thenReturn(createServletInputStream(input));
+  }
+
+  private ServletInputStream createServletInputStream(final InputStream inputStream) {
+    return new ServletInputStream() {
+      @Override
+      public int read() throws IOException {
+        return inputStream.read();
+      }
+    };
+  }
+
+  private InputStream createReasonAsInputStream(String content) {
+    return new ByteArrayInputStream(content.getBytes(Charsets.UTF_8));
+  }
+
+  private String createReason(String message) {
+    return String.format("{\"message\": \"%s\"}", message);
+  }
+
+  public static class EventListener {
+
+    private RestartEvent restartEvent;
+
+    @Subscribe(async = false)
+    public void store(RestartEvent restartEvent) {
+      this.restartEvent = restartEvent;
+    }
+
+  }
+}
diff --git a/scm-webapp/src/test/java/sonia/scm/boot/ServletContextCleanerTest.java b/scm-webapp/src/test/java/sonia/scm/boot/ServletContextCleanerTest.java
new file mode 100644
index 0000000000..a26cf3b215
--- /dev/null
+++ b/scm-webapp/src/test/java/sonia/scm/boot/ServletContextCleanerTest.java
@@ -0,0 +1,53 @@
+package sonia.scm.boot;
+
+import com.google.common.collect.ImmutableSet;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import javax.servlet.ServletContext;
+
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Set;
+import java.util.Vector;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ServletContextCleanerTest {
+
+  @Mock
+  private ServletContext servletContext;
+
+  @Test
+  public void testCleanup() {
+    Set<String> names = ImmutableSet.of(
+      "org.jboss.resteasy.Dispatcher",
+      "resteasy.Deployment",
+      "sonia.scm.Context",
+      "org.eclipse.jetty.HttpServer",
+      "javax.servlet.Context",
+      "org.apache.shiro.SecurityManager"
+    );
+
+    when(servletContext.getAttributeNames()).thenReturn(toEnumeration(names));
+
+    ServletContextCleaner.cleanup(servletContext);
+
+    verify(servletContext).removeAttribute("org.jboss.resteasy.Dispatcher");
+    verify(servletContext).removeAttribute("resteasy.Deployment");
+    verify(servletContext).removeAttribute("sonia.scm.Context");
+    verify(servletContext, never()).removeAttribute("org.eclipse.jetty.HttpServer");
+    verify(servletContext, never()).removeAttribute("javax.servlet.Context");
+    verify(servletContext).removeAttribute("org.apache.shiro.SecurityManager");
+  }
+
+  private <T> Enumeration<T> toEnumeration(Collection<T> collection) {
+    return new Vector<>(collection).elements();
+  }
+}

From 4ca2452d5da7e5e70766d5901ce9708dca805c1f Mon Sep 17 00:00:00 2001
From: Mohamed Karray <mohamed.karray.sr@gmail.com>
Date: Wed, 24 Oct 2018 13:03:51 +0200
Subject: [PATCH 013/188] copy the SvnDiffGenerator

---
 .../repository/spi/SCMSvnDiffGenerator.java   | 1231 +++++++++++++++++
 1 file changed, 1231 insertions(+)
 create mode 100644 scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java

diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
new file mode 100644
index 0000000000..c0e68bd4a0
--- /dev/null
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
@@ -0,0 +1,1231 @@
+package sonia.scm.repository.spi;
+
+import de.regnis.q.sequence.line.diff.QDiffGenerator;
+import de.regnis.q.sequence.line.diff.QDiffGeneratorFactory;
+import de.regnis.q.sequence.line.diff.QDiffManager;
+import de.regnis.q.sequence.line.diff.QDiffUniGenerator;
+import org.tmatesoft.svn.core.SVNErrorCode;
+import org.tmatesoft.svn.core.SVNErrorMessage;
+import org.tmatesoft.svn.core.SVNException;
+import org.tmatesoft.svn.core.SVNMergeRangeList;
+import org.tmatesoft.svn.core.SVNProperties;
+import org.tmatesoft.svn.core.SVNProperty;
+import org.tmatesoft.svn.core.SVNPropertyValue;
+import org.tmatesoft.svn.core.internal.util.SVNHashMap;
+import org.tmatesoft.svn.core.internal.util.SVNMergeInfoUtil;
+import org.tmatesoft.svn.core.internal.util.SVNPathUtil;
+import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions;
+import org.tmatesoft.svn.core.internal.wc.ISVNReturnValueCallback;
+import org.tmatesoft.svn.core.internal.wc.SVNErrorManager;
+import org.tmatesoft.svn.core.internal.wc.SVNFileUtil;
+import org.tmatesoft.svn.core.internal.wc2.ng.ISvnDiffGenerator;
+import org.tmatesoft.svn.core.internal.wc2.ng.SvnDiffCallback;
+import org.tmatesoft.svn.core.wc.ISVNOptions;
+import org.tmatesoft.svn.core.wc.SVNDiffOptions;
+import org.tmatesoft.svn.core.wc2.SvnTarget;
+import org.tmatesoft.svn.util.SVNLogType;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
+
+    protected static final String WC_REVISION_LABEL = "(working copy)";
+    protected static final String PROPERTIES_SEPARATOR = "___________________________________________________________________";
+    protected static final String HEADER_SEPARATOR = "===================================================================";
+    protected static final String HEADER_ENCODING = "UTF-8";
+
+    private SvnTarget originalTarget1;
+    private SvnTarget originalTarget2;
+    private SvnTarget baseTarget;
+    private SvnTarget relativeToTarget;
+    private SvnTarget repositoryRoot;
+    private String encoding;
+    private byte[] eol;
+    private boolean useGitFormat;
+    private boolean forcedBinaryDiff;
+
+    private boolean diffDeleted;
+    private boolean diffAdded;
+    private List<String> rawDiffOptions;
+    private boolean forceEmpty;
+
+    private Set<String> visitedPaths;
+    private String externalDiffCommand;
+    private SVNDiffOptions diffOptions;
+    private boolean fallbackToAbsolutePath;
+    private ISVNOptions options;
+    private boolean propertiesOnly;
+    private boolean ignoreProperties;
+
+    private String getDisplayPath(SvnTarget target) {
+        String relativePath;
+        if (baseTarget == null) {
+            relativePath = null;
+        } else {
+            String targetString = target.getPathOrUrlDecodedString();
+            String baseTargetString = baseTarget.getPathOrUrlDecodedString();
+            relativePath = getRelativePath(targetString, baseTargetString);
+        }
+
+        return relativePath != null ? relativePath : target.getPathOrUrlString();
+    }
+
+    private String getRelativeToRootPath(SvnTarget target, SvnTarget originalTarget) {
+        String relativePath;
+        if (repositoryRoot == null) {
+            relativePath = null;
+        } else {
+            if (repositoryRoot.isFile() == target.isFile()) {
+                String targetString = target.getPathOrUrlDecodedString();
+                String baseTargetString = repositoryRoot.getPathOrUrlDecodedString();
+                relativePath = getRelativePath(targetString, baseTargetString);
+            } else {
+                String targetString = target.getPathOrUrlDecodedString();
+                String baseTargetString = new File("").getAbsolutePath();
+                relativePath = getRelativePath(targetString, baseTargetString);
+            }
+        }
+
+        return relativePath != null ? relativePath : target.getPathOrUrlString();
+    }
+
+    private String getRelativePath(String targetString, String baseTargetString) {
+        if (targetString != null) {
+            targetString = targetString.replace(File.separatorChar, '/');
+        }
+        if (baseTargetString != null) {
+            baseTargetString = baseTargetString.replace(File.separatorChar, '/');
+        }
+
+        final String pathAsChild = SVNPathUtil.getPathAsChild(baseTargetString, targetString);
+        if (pathAsChild != null) {
+            return pathAsChild;
+        }
+        if (targetString.equals(baseTargetString)) {
+            return "";
+        }
+        return null;
+    }
+
+    private String getChildPath(String path, String relativeToPath) {
+        if (relativeToTarget == null) {
+            return null;
+        }
+
+        String relativePath = getRelativePath(path, relativeToPath);
+        if (relativePath == null) {
+            return path;
+        }
+
+        if (relativePath.length() > 0) {
+            return relativePath;
+        }
+
+        if (relativeToPath.equals(path)) {
+            return ".";
+        }
+
+        return null;
+    }
+
+    public SCMSvnDiffGenerator() {
+        this.originalTarget1 = null;
+        this.originalTarget2 = null;
+        this.visitedPaths = new HashSet<String>();
+        this.diffDeleted = true;
+        this.diffAdded = true;
+    }
+
+    public void setBaseTarget(SvnTarget baseTarget) {
+        this.baseTarget = baseTarget;
+    }
+
+    public void setUseGitFormat(boolean useGitFormat) {
+        this.useGitFormat = useGitFormat;
+    }
+
+    public void setOriginalTargets(SvnTarget originalTarget1, SvnTarget originalTarget2) {
+        this.originalTarget1 = originalTarget1;
+        this.originalTarget2 = originalTarget2;
+    }
+
+    public void setRelativeToTarget(SvnTarget relativeToTarget) {
+        this.relativeToTarget = relativeToTarget;
+    }
+
+    public void setAnchors(SvnTarget originalTarget1, SvnTarget originalTarget2) {
+        //anchors are not used
+    }
+
+    public void setRepositoryRoot(SvnTarget repositoryRoot) {
+        this.repositoryRoot = repositoryRoot;
+    }
+
+    public void setForceEmpty(boolean forceEmpty) {
+        this.forceEmpty = forceEmpty;
+    }
+
+    public void setEncoding(String encoding) {
+        this.encoding = encoding;
+    }
+
+    public String getEncoding() {
+        return encoding;
+    }
+
+    public String getGlobalEncoding() {
+        ISVNOptions options = getOptions();
+
+        if (options != null && options instanceof DefaultSVNOptions) {
+            DefaultSVNOptions defaultOptions = (DefaultSVNOptions) options;
+            return defaultOptions.getGlobalCharset();
+        }
+        return null;
+    }
+
+    public void setEOL(byte[] eol) {
+        this.eol = eol;
+    }
+
+    public byte[] getEOL() {
+        return eol;
+    }
+
+    public boolean isForcedBinaryDiff() {
+        return forcedBinaryDiff;
+    }
+
+    public void setForcedBinaryDiff(boolean forcedBinaryDiff) {
+        this.forcedBinaryDiff = forcedBinaryDiff;
+    }
+
+    public boolean isPropertiesOnly() {
+        return propertiesOnly;
+    }
+
+    public void setPropertiesOnly(boolean propertiesOnly) {
+        this.propertiesOnly = propertiesOnly;
+    }
+
+    public boolean isIgnoreProperties() {
+        return ignoreProperties;
+    }
+
+    public void setIgnoreProperties(boolean ignoreProperties) {
+        this.ignoreProperties = ignoreProperties;
+    }
+
+    public void displayDeletedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream) throws SVNException {
+    }
+
+    public void displayAddedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream) throws SVNException {
+    }
+
+    public void displayPropsChanged(SvnTarget target, String revision1, String revision2, boolean dirWasAdded, SVNProperties originalProps, SVNProperties propChanges, OutputStream outputStream) throws SVNException {
+        if (isIgnoreProperties()) {
+            return;
+        }
+        if (dirWasAdded && !isDiffAdded()) {
+            return;
+        }
+        ensureEncodingAndEOLSet();
+        String displayPath = getDisplayPath(target);
+
+        String targetString1 = originalTarget1.getPathOrUrlDecodedString();
+        String targetString2 = originalTarget2.getPathOrUrlDecodedString();
+
+        if (displayPath == null || displayPath.length() == 0) {
+            displayPath = ".";
+        }
+
+        if (useGitFormat) {
+            targetString1 = adjustRelativeToReposRoot(targetString1);
+            targetString2 = adjustRelativeToReposRoot(targetString2);
+        }
+
+        String newTargetString = displayPath;
+        String newTargetString1 = targetString1;
+        String newTargetString2 = targetString2;
+
+        String commonAncestor = SVNPathUtil.getCommonPathAncestor(newTargetString1, newTargetString2);
+        int commonLength = commonAncestor == null ? 0 : commonAncestor.length();
+
+        newTargetString1 = newTargetString1.substring(commonLength);
+        newTargetString2 = newTargetString2.substring(commonLength);
+
+        newTargetString1 = computeLabel(newTargetString, newTargetString1);
+        newTargetString2 = computeLabel(newTargetString, newTargetString2);
+
+        if (relativeToTarget != null) {
+            String relativeToPath = relativeToTarget.getPathOrUrlDecodedString();
+            String absolutePath = target.getPathOrUrlDecodedString();
+
+            String childPath = getChildPath(absolutePath, relativeToPath);
+            if (childPath == null) {
+                throwBadRelativePathException(absolutePath, relativeToPath);
+            }
+            String childPath1 = getChildPath(newTargetString1, relativeToPath);
+            if (childPath1 == null) {
+                throwBadRelativePathException(newTargetString1, relativeToPath);
+            }
+            String childPath2 = getChildPath(newTargetString2, relativeToPath);
+            if (childPath2 == null) {
+                throwBadRelativePathException(newTargetString2, relativeToPath);
+            }
+
+            displayPath = childPath;
+            newTargetString1 = childPath1;
+            newTargetString2 = childPath2;
+        }
+
+        boolean showDiffHeader = !visitedPaths.contains(displayPath);
+        if (showDiffHeader) {
+            String label1 = getLabel(newTargetString1, revision1);
+            String label2 = getLabel(newTargetString2, revision2);
+
+            boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, false, fallbackToAbsolutePath, SvnDiffCallback.OperationKind.Modified);
+            visitedPaths.add(displayPath);
+            if (useGitFormat) {
+                displayGitDiffHeader(outputStream, SvnDiffCallback.OperationKind.Modified,
+                        getRelativeToRootPath(target, originalTarget1),
+                        getRelativeToRootPath(target, originalTarget2),
+                        null);
+            }
+            if (shouldStopDisplaying) {
+                return;
+            }
+
+//            if (useGitFormat) {
+//                String copyFromPath = null;
+//                SvnDiffCallback.OperationKind operationKind = SvnDiffCallback.OperationKind.Modified;
+//                label1 = getGitDiffLabel1(operationKind, targetString1, targetString2, copyFromPath, revision1);
+//                label2 = getGitDiffLabel2(operationKind, targetString1, targetString2, copyFromPath, revision2);
+//                displayGitDiffHeader(outputStream, operationKind,
+//                        getRelativeToRootPath(target, originalTarget1),
+//                        getRelativeToRootPath(target, originalTarget2),
+//                        copyFromPath);
+//            }
+
+            if (useGitFormat) {
+                displayGitHeaderFields(outputStream, target, revision1, revision2, SvnDiffCallback.OperationKind.Modified, null);
+            } else {
+                displayHeaderFields(outputStream, label1, label2);
+            }
+        }
+
+        displayPropertyChangesOn(useGitFormat ? getRelativeToRootPath(target, originalTarget1) : displayPath, outputStream);
+
+        displayPropDiffValues(outputStream, propChanges, originalProps);
+    }
+
+    private void throwBadRelativePathException(String displayPath, String relativeToPath) throws SVNException {
+        SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.BAD_RELATIVE_PATH, "Path ''{0}'' must be an immediate child of the directory ''{0}''",
+                displayPath, relativeToPath);
+        SVNErrorManager.error(errorMessage, SVNLogType.CLIENT);
+    }
+
+    private void displayGitHeaderFields(OutputStream outputStream, SvnTarget target, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+        String path1 = copyFromPath != null ? copyFromPath : getRelativeToRootPath(target, originalTarget1);
+        String path2 = getRelativeToRootPath(target, originalTarget2);
+
+        try {
+            displayString(outputStream, "--- ");
+            displayFirstGitLabelPath(outputStream, path1, revision1, operation);
+            displayEOL(outputStream);
+            displayString(outputStream, "+++ ");
+            displaySecondGitLabelPath(outputStream, path2, revision2, operation);
+            displayEOL(outputStream);
+        } catch (IOException e) {
+            wrapException(e);
+        }
+    }
+
+    private String adjustRelativeToReposRoot(String targetString) {
+        if (repositoryRoot != null) {
+            String repositoryRootString = repositoryRoot.getPathOrUrlDecodedString();
+            String relativePath = getRelativePath(targetString, repositoryRootString);
+            return relativePath == null ? "" : relativePath;
+        }
+        return targetString;
+    }
+
+    private String computeLabel(String targetString, String originalTargetString) {
+        if (originalTargetString.length() == 0) {
+            return targetString;
+        } else if (originalTargetString.charAt(0) == '/') {
+            return targetString + "\t(..." + originalTargetString + ")";
+        } else {
+            return targetString + "\t(.../" + originalTargetString + ")";
+        }
+    }
+
+    public void displayContentChanged(SvnTarget target, File leftFile, File rightFile, String revision1, String revision2, String mimeType1, String mimeType2, SvnDiffCallback.OperationKind operation, File copyFromPath, SVNProperties originalProperties, SVNProperties propChanges, OutputStream outputStream) throws SVNException {
+        if (isPropertiesOnly()) {
+            return;
+        }
+        ensureEncodingAndEOLSet();
+        String displayPath = getDisplayPath(target);
+
+        String targetString1 = originalTarget1.getPathOrUrlDecodedString();
+        String targetString2 = originalTarget2.getPathOrUrlDecodedString();
+
+        if (useGitFormat) {
+            targetString1 = adjustRelativeToReposRoot(targetString1);
+            targetString2 = adjustRelativeToReposRoot(targetString2);
+        }
+
+        String newTargetString = displayPath;
+        String newTargetString1 = targetString1;
+        String newTargetString2 = targetString2;
+
+        String commonAncestor = SVNPathUtil.getCommonPathAncestor(newTargetString1, newTargetString2);
+        int commonLength = commonAncestor == null ? 0 : commonAncestor.length();
+
+        newTargetString1 = newTargetString1.substring(commonLength);
+        newTargetString2 = newTargetString2.substring(commonLength);
+
+        newTargetString1 = computeLabel(newTargetString, newTargetString1);
+        newTargetString2 = computeLabel(newTargetString, newTargetString2);
+
+            if (relativeToTarget != null) {
+                String relativeToPath = relativeToTarget.getPathOrUrlDecodedString();
+                String absolutePath = target.getPathOrUrlDecodedString();
+
+                String childPath = getChildPath(absolutePath, relativeToPath);
+                if (childPath == null) {
+                    throwBadRelativePathException(absolutePath, relativeToPath);
+                }
+                String childPath1 = getChildPath(newTargetString1, relativeToPath);
+                if (childPath1 == null) {
+                    throwBadRelativePathException(newTargetString1, relativeToPath);
+                }
+                String childPath2 = getChildPath(newTargetString2, relativeToPath);
+                if (childPath2 == null) {
+                    throwBadRelativePathException(newTargetString2, relativeToPath);
+                }
+
+                displayPath = childPath;
+                newTargetString1 = childPath1;
+                newTargetString2 = childPath2;
+            }
+
+        String label1 = getLabel(newTargetString1, revision1);
+        String label2 = getLabel(newTargetString2, revision2);
+
+        boolean leftIsBinary = false;
+        boolean rightIsBinary = false;
+
+        if (mimeType1 != null) {
+            leftIsBinary = SVNProperty.isBinaryMimeType(mimeType1);
+        }
+        if (mimeType2 != null) {
+            rightIsBinary = SVNProperty.isBinaryMimeType(mimeType2);
+        }
+
+        if (!forcedBinaryDiff && (leftIsBinary || rightIsBinary)) {
+            boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
+            if (useGitFormat) {
+                displayGitDiffHeader(outputStream, operation,
+                        getRelativeToRootPath(target, originalTarget1),
+                        getRelativeToRootPath(target, originalTarget2),
+                        null);
+            }
+            visitedPaths.add(displayPath);
+            if (shouldStopDisplaying) {
+                return;
+            }
+
+
+
+            displayBinary(mimeType1, mimeType2, outputStream, leftIsBinary, rightIsBinary);
+
+            return;
+        }
+
+        final String diffCommand = getExternalDiffCommand();
+        if (diffCommand != null) {
+            boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
+            if (useGitFormat) {
+                displayGitDiffHeader(outputStream, operation,
+                        getRelativeToRootPath(target, originalTarget1),
+                        getRelativeToRootPath(target, originalTarget2),
+                        null);
+            }
+            visitedPaths.add(displayPath);
+            if (shouldStopDisplaying) {
+                return;
+            }
+
+            runExternalDiffCommand(outputStream, diffCommand, leftFile, rightFile, label1, label2);
+        } else {
+            internalDiff(target, outputStream, displayPath, leftFile, rightFile, label1, label2, operation, copyFromPath == null ? null : copyFromPath.getPath(), revision1, revision2);
+        }
+    }
+
+    private void displayBinary(String mimeType1, String mimeType2, OutputStream outputStream, boolean leftIsBinary, boolean rightIsBinary) throws SVNException {
+        displayCannotDisplayFileMarkedBinary(outputStream);
+
+        if (leftIsBinary && !rightIsBinary) {
+            displayMimeType(outputStream, mimeType1);
+        } else if (!leftIsBinary && rightIsBinary) {
+            displayMimeType(outputStream, mimeType2);
+        } else if (leftIsBinary && rightIsBinary) {
+            if (mimeType1.equals(mimeType2)) {
+                displayMimeType(outputStream, mimeType1);
+            } else {
+                displayMimeTypes(outputStream, mimeType1, mimeType2);
+            }
+        }
+    }
+
+    private void internalDiff(SvnTarget target, OutputStream outputStream, String displayPath, File file1, File file2, String label1, String label2, SvnDiffCallback.OperationKind operation, String copyFromPath, String revision1, String revision2) throws SVNException {
+        String header = getHeaderString(target, displayPath, file2 == null, file1 == null, operation, copyFromPath);
+        if (file2 == null && !isDiffDeleted()) {
+            try {
+                displayString(outputStream, header);
+            } catch (IOException e) {
+                wrapException(e);
+            }
+            visitedPaths.add(displayPath);
+            return;
+        }
+        if (file1 == null && !isDiffAdded()) {
+            try {
+                displayString(outputStream, header);
+            } catch (IOException e) {
+                wrapException(e);
+            }
+            visitedPaths.add(displayPath);
+            return;
+        }
+        String headerFields = getHeaderFieldsString(target, displayPath, label1, label2, revision1, revision2, operation, copyFromPath);
+
+        RandomAccessFile is1 = null;
+        RandomAccessFile is2 = null;
+        try {
+            is1 = file1 == null ? null : SVNFileUtil.openRAFileForReading(file1);
+            is2 = file2 == null ? null : SVNFileUtil.openRAFileForReading(file2);
+
+            QDiffUniGenerator.setup();
+            Map properties = new SVNHashMap();
+
+            properties.put(QDiffGeneratorFactory.IGNORE_EOL_PROPERTY, Boolean.valueOf(getDiffOptions().isIgnoreEOLStyle()));
+            properties.put(QDiffGeneratorFactory.EOL_PROPERTY, new String(getEOL()));
+            if (getDiffOptions().isIgnoreAllWhitespace()) {
+                properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_ALL_SPACE);
+            } else if (getDiffOptions().isIgnoreAmountOfWhitespace()) {
+                properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_SPACE_CHANGE);
+            }
+
+            final String diffHeader;
+            if (forceEmpty || useGitFormat) {
+                displayString(outputStream, header);
+                diffHeader = headerFields;
+
+                visitedPaths.add(displayPath);
+            } else {
+                diffHeader = header + headerFields;
+            }
+            QDiffGenerator generator = new QDiffUniGenerator(properties, diffHeader);
+            EmptyDetectionOutputStream emptyDetectionOutputStream = new EmptyDetectionOutputStream(outputStream);
+            QDiffManager.generateTextDiff(is1, is2, emptyDetectionOutputStream, generator);
+            if (emptyDetectionOutputStream.isSomethingWritten()) {
+                visitedPaths.add(displayPath);
+            }
+            emptyDetectionOutputStream.flush();
+        } catch (IOException e) {
+            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, e.getMessage());
+            SVNErrorManager.error(err, e, SVNLogType.DEFAULT);
+        } finally {
+            SVNFileUtil.closeFile(is1);
+            SVNFileUtil.closeFile(is2);
+        }
+    }
+
+    private String getHeaderFieldsString(SvnTarget target, String displayPath, String label1, String label2, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+        final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        try {
+            if (useGitFormat) {
+                displayGitHeaderFields(byteArrayOutputStream, target, revision1, revision2, operation, copyFromPath);
+            } else {
+                displayHeaderFields(byteArrayOutputStream, label1, label2);
+            }
+        } catch (SVNException e) {
+            SVNFileUtil.closeFile(byteArrayOutputStream);
+
+            try {
+                byteArrayOutputStream.writeTo(byteArrayOutputStream);
+            } catch (IOException e1) {
+            }
+
+            throw e;
+        }
+
+        try {
+            byteArrayOutputStream.close();
+            return byteArrayOutputStream.toString(HEADER_ENCODING);
+        } catch (IOException e) {
+            return "";
+        }
+    }
+
+    private String getHeaderString(SvnTarget target, String displayPath, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+        final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        try {
+            boolean stopDisplaying = displayHeader(byteArrayOutputStream, displayPath, deleted, added, operation);
+            if (useGitFormat) {
+                displayGitDiffHeader(byteArrayOutputStream, operation,
+                        getRelativeToRootPath(target, originalTarget1),
+                        getRelativeToRootPath(target, originalTarget2),
+                        copyFromPath);
+            }
+        } catch (SVNException e) {
+            SVNFileUtil.closeFile(byteArrayOutputStream);
+
+            try {
+                byteArrayOutputStream.writeTo(byteArrayOutputStream);
+            } catch (IOException e1) {
+            }
+
+            throw e;
+        }
+
+        try {
+            byteArrayOutputStream.close();
+            return byteArrayOutputStream.toString(HEADER_ENCODING);
+        } catch (IOException e) {
+            return "";
+        }
+    }
+
+    private void runExternalDiffCommand(OutputStream outputStream, final String diffCommand, File file1, File file2, String label1, String label2) throws SVNException {
+        final List<String> args = new ArrayList<String>();
+        args.add(diffCommand);
+        if (rawDiffOptions != null) {
+            args.addAll(rawDiffOptions);
+        } else {
+            Collection svnDiffOptionsCollection = getDiffOptions().toOptionsCollection();
+            args.addAll(svnDiffOptionsCollection);
+            args.add("-u");
+        }
+
+        if (label1 != null) {
+            args.add("-L");
+            args.add(label1);
+        }
+
+        if (label2 != null) {
+            args.add("-L");
+            args.add(label2);
+        }
+
+        boolean tmpFile1 = false;
+        boolean tmpFile2 = false;
+        if (file1 == null) {
+            file1 = SVNFileUtil.createTempFile("svn.", ".tmp");
+            tmpFile1 = true;
+        }
+        if (file2 == null) {
+            file2 = SVNFileUtil.createTempFile("svn.", ".tmp");
+            tmpFile2 = true;
+        }
+
+        String file1Path = file1.getAbsolutePath().replace(File.separatorChar, '/');
+        String file2Path = file2.getAbsolutePath().replace(File.separatorChar, '/');
+
+        args.add(file1Path);
+        args.add(file2Path);
+            try {
+                final Writer writer = new OutputStreamWriter(outputStream, getEncoding());
+
+                SVNFileUtil.execCommand(args.toArray(new String[args.size()]), true,
+                        new ISVNReturnValueCallback() {
+
+                    public void handleReturnValue(int returnValue) throws SVNException {
+                        if (returnValue != 0 && returnValue != 1) {
+                            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.EXTERNAL_PROGRAM,
+                                    "''{0}'' returned {1}", new Object[] { diffCommand, String.valueOf(returnValue) });
+                            SVNErrorManager.error(err, SVNLogType.DEFAULT);
+                        }
+                    }
+
+                    public void handleChar(char ch) throws SVNException {
+                        try {
+                            writer.write(ch);
+                        } catch (IOException ioe) {
+                            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, ioe.getMessage());
+                            SVNErrorManager.error(err, ioe, SVNLogType.DEFAULT);
+                        }
+                    }
+
+                    public boolean isHandleProgramOutput() {
+                        return true;
+                    }
+                });
+
+                writer.flush();
+            } catch (IOException ioe) {
+                SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, ioe.getMessage());
+                SVNErrorManager.error(err, ioe, SVNLogType.DEFAULT);
+            } finally {
+                try {
+                    if (tmpFile1) {
+                        SVNFileUtil.deleteFile(file1);
+                    }
+                    if (tmpFile2) {
+                        SVNFileUtil.deleteFile(file2);
+                    }
+                } catch (SVNException e) {
+                    // skip
+                }
+            }
+    }
+
+    private String getExternalDiffCommand() {
+        return externalDiffCommand;
+    }
+
+    private void displayMimeType(OutputStream outputStream, String mimeType) throws SVNException {
+        try {
+            displayString(outputStream, SVNProperty.MIME_TYPE);
+            displayString(outputStream, " = ");
+            displayString(outputStream, mimeType);
+            displayEOL(outputStream);
+        } catch (IOException e) {
+            wrapException(e);
+        }
+    }
+
+    private void displayMimeTypes(OutputStream outputStream, String mimeType1, String mimeType2) throws SVNException {
+        try {
+            displayString(outputStream, SVNProperty.MIME_TYPE);
+            displayString(outputStream, " = (");
+            displayString(outputStream, mimeType1);
+            displayString(outputStream, ", ");
+            displayString(outputStream, mimeType2);
+            displayString(outputStream, ")");
+            displayEOL(outputStream);
+        } catch (IOException e) {
+            wrapException(e);
+        }
+    }
+
+    private void displayCannotDisplayFileMarkedBinary(OutputStream outputStream) throws SVNException {
+        try {
+            displayString(outputStream, "Cannot display: file marked as a binary type.");
+            displayEOL(outputStream);
+        } catch (IOException e) {
+            wrapException(e);
+        }
+    }
+
+    private void ensureEncodingAndEOLSet() {
+        if (getEOL() == null) {
+            setEOL(SVNProperty.EOL_LF_BYTES);
+        }
+        if (getEncoding() == null) {
+            final ISVNOptions options = getOptions();
+            if (options != null && options.getNativeCharset() != null) {
+                setEncoding(options.getNativeCharset());
+            } else {
+                setEncoding("UTF-8");
+            }
+        }
+    }
+
+    private void displayPropDiffValues(OutputStream outputStream, SVNProperties diff, SVNProperties baseProps) throws SVNException {
+        for (Iterator changedPropNames = diff.nameSet().iterator(); changedPropNames.hasNext();) {
+            String name = (String) changedPropNames.next();
+            SVNPropertyValue originalValue = baseProps != null ? baseProps.getSVNPropertyValue(name) : null;
+            SVNPropertyValue newValue = diff.getSVNPropertyValue(name);
+            String headerFormat = null;
+
+            if (originalValue == null) {
+                headerFormat = "Added: ";
+            } else if (newValue == null) {
+                headerFormat = "Deleted: ";
+            } else {
+                headerFormat = "Modified: ";
+            }
+
+            try {
+                displayString(outputStream, (headerFormat + name));
+                displayEOL(outputStream);
+                if (SVNProperty.MERGE_INFO.equals(name)) {
+                    displayMergeInfoDiff(outputStream, originalValue == null ? null : originalValue.getString(), newValue == null ? null : newValue.getString());
+                    continue;
+                }
+
+                byte[] originalValueBytes = getPropertyAsBytes(originalValue, getEncoding());
+                byte[] newValueBytes = getPropertyAsBytes(newValue, getEncoding());
+
+                if (originalValueBytes == null) {
+                    originalValueBytes = new byte[0];
+                } else {
+                    originalValueBytes = maybeAppendEOL(originalValueBytes);
+                }
+
+                boolean newValueHadEol = newValueBytes != null && newValueBytes.length > 0 &&
+                        (newValueBytes[newValueBytes.length - 1] == SVNProperty.EOL_CR_BYTES[0] ||
+                        newValueBytes[newValueBytes.length - 1] == SVNProperty.EOL_LF_BYTES[0]);
+
+                if (newValueBytes == null) {
+                    newValueBytes = new byte[0];
+                } else {
+                    newValueBytes = maybeAppendEOL(newValueBytes);
+                }
+
+                QDiffUniGenerator.setup();
+                Map properties = new SVNHashMap();
+
+                properties.put(QDiffGeneratorFactory.IGNORE_EOL_PROPERTY, Boolean.valueOf(getDiffOptions().isIgnoreEOLStyle()));
+                properties.put(QDiffGeneratorFactory.EOL_PROPERTY, new String(getEOL()));
+                properties.put(QDiffGeneratorFactory.HUNK_DELIMITER, "##");
+                if (getDiffOptions().isIgnoreAllWhitespace()) {
+                    properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_ALL_SPACE);
+                } else if (getDiffOptions().isIgnoreAmountOfWhitespace()) {
+                    properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_SPACE_CHANGE);
+                }
+
+                QDiffGenerator generator = new QDiffUniGenerator(properties, "");
+                Writer writer = new OutputStreamWriter(outputStream, getEncoding());
+                QDiffManager.generateTextDiff(new ByteArrayInputStream(originalValueBytes), new ByteArrayInputStream(newValueBytes),
+                        null, writer, generator);
+                writer.flush();
+                if (!newValueHadEol) {
+                    displayString(outputStream, "\\ No newline at end of property");
+                    displayEOL(outputStream);
+                }
+            } catch (IOException e) {
+                wrapException(e);
+            }
+        }
+
+    }
+
+    private byte[] maybeAppendEOL(byte[] buffer) {
+        if (buffer.length == 0) {
+            return buffer;
+        }
+
+        byte lastByte = buffer[buffer.length - 1];
+        if (lastByte == SVNProperty.EOL_CR_BYTES[0]) {
+            return buffer;
+        } else if (lastByte != SVNProperty.EOL_LF_BYTES[0]) {
+            final byte[] newBuffer = new byte[buffer.length + getEOL().length];
+            System.arraycopy(buffer, 0, newBuffer, 0, buffer.length);
+            System.arraycopy(getEOL(), 0, newBuffer, buffer.length, getEOL().length);
+            return newBuffer;
+        } else {
+            return buffer;
+        }
+    }
+
+    private String getGitDiffLabel1(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision) {
+        if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+            return getLabel("a/" + path1, revision);
+        } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+            return getLabel("a/" + copyFromPath, revision);
+        } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+            return getLabel("/dev/null", revision);
+        } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+            return getLabel("a/" + path1, revision);
+        } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+            return getLabel("a/" + copyFromPath, revision);
+        }
+        throw new IllegalArgumentException("Unsupported operation: " + operationKind);
+    }
+
+    private String getGitDiffLabel2(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision) {
+        if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+            return getLabel("/dev/null", revision);
+        } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+            return getLabel("b/" + path2, revision);
+        } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+            return getLabel("b/" + path2, revision);
+        } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+            return getLabel("b/" + path2, revision);
+        } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+            return getLabel("b/" + path2, revision);
+        }
+        throw new IllegalArgumentException("Unsupported operation: " + operationKind);
+    }
+
+    private void displayGitDiffHeader(OutputStream outputStream, SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath) throws SVNException {
+        if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+            displayGitDiffHeaderDeleted(outputStream, path1, path2, copyFromPath);
+        } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+            displayGitDiffHeaderCopied(outputStream, path1, path2, copyFromPath);
+        } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+            displayGitDiffHeaderAdded(outputStream, path1, path2, copyFromPath);
+        } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+            displayGitDiffHeaderModified(outputStream, path1, path2, copyFromPath);
+        } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+            displayGitDiffHeaderRenamed(outputStream, path1, path2, copyFromPath);
+        }
+    }
+
+    private void displayGitDiffHeaderAdded(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+        try {
+            displayString(outputStream, "diff --git ");
+            displayFirstGitPath(outputStream, path1);
+            displayString(outputStream, " ");
+            displaySecondGitPath(outputStream, path2);
+            displayEOL(outputStream);
+            displayString(outputStream, "new file mode 10644");
+            displayEOL(outputStream);
+        } catch (IOException e) {
+            wrapException(e);
+        }
+    }
+
+    private void displayGitDiffHeaderDeleted(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+        try {
+            displayString(outputStream, "diff --git ");
+            displayFirstGitPath(outputStream, path1);
+            displayString(outputStream, " ");
+            displaySecondGitPath(outputStream, path2);
+            displayEOL(outputStream);
+            displayString(outputStream, "deleted file mode 10644");
+            displayEOL(outputStream);
+        } catch (IOException e) {
+            wrapException(e);
+        }
+    }
+
+    private void displayGitDiffHeaderCopied(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+        try {
+            displayString(outputStream, "diff --git ");
+            displayFirstGitPath(outputStream, copyFromPath);
+            displayString(outputStream, " ");
+            displaySecondGitPath(outputStream, path2);
+            displayEOL(outputStream);
+            displayString(outputStream, "copy from ");
+            displayString(outputStream, copyFromPath);
+            displayEOL(outputStream);
+            displayString(outputStream, "copy to ");
+            displayString(outputStream, path2);
+            displayEOL(outputStream);
+        } catch (IOException e) {
+            wrapException(e);
+        }
+    }
+
+    private void displayGitDiffHeaderRenamed(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+        try {
+            displayString(outputStream, "diff --git ");
+            displayFirstGitPath(outputStream, copyFromPath);
+            displayString(outputStream, " ");
+            displaySecondGitPath(outputStream, path2);
+            displayEOL(outputStream);
+            displayString(outputStream, "rename from ");
+            displayString(outputStream, copyFromPath);
+            displayEOL(outputStream);
+            displayString(outputStream, "rename to ");
+            displayString(outputStream, path2);
+            displayEOL(outputStream);
+        } catch (IOException e) {
+            wrapException(e);
+        }
+    }
+
+    private void displayGitDiffHeaderModified(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+        try {
+            displayString(outputStream, "diff --git ");
+            displayFirstGitPath(outputStream, path1);
+            displayString(outputStream, " ");
+            displaySecondGitPath(outputStream, path2);
+            displayEOL(outputStream);
+        } catch (IOException e) {
+            wrapException(e);
+        }
+    }
+
+    private void displayFirstGitPath(OutputStream outputStream, String path1) throws IOException {
+        displayGitPath(outputStream, path1, "a/", false);
+    }
+
+    private void displaySecondGitPath(OutputStream outputStream, String path2) throws IOException {
+        displayGitPath(outputStream, path2, "b/", false);
+    }
+
+    private void displayFirstGitLabelPath(OutputStream outputStream, String path1, String revision1, SvnDiffCallback.OperationKind operation) throws IOException {
+        String pathPrefix = "a/";
+        if (operation == SvnDiffCallback.OperationKind.Added) {
+            path1 = "/dev/null";
+            pathPrefix = "";
+        }
+        displayGitPath(outputStream, getLabel(path1, revision1), pathPrefix, true);
+    }
+
+    private void displaySecondGitLabelPath(OutputStream outputStream, String path2, String revision2, SvnDiffCallback.OperationKind operation) throws IOException {
+        String pathPrefix = "b/";
+        if (operation == SvnDiffCallback.OperationKind.Deleted) {
+            path2 = "/dev/null";
+            pathPrefix = "";
+        }
+        displayGitPath(outputStream, getLabel(path2, revision2), pathPrefix, true);
+    }
+
+    private void displayGitPath(OutputStream outputStream, String path1, String pathPrefix, boolean label) throws IOException {
+//        if (!label && path1.length() == 0) {
+//            displayString(outputStream, ".");
+//        } else {
+            displayString(outputStream, pathPrefix);
+            displayString(outputStream, path1);
+//        }
+    }
+
+    private String getAdjustedPathWithLabel(String displayPath, String path, String revision, String commonAncestor) {
+        String adjustedPath = getAdjustedPath(displayPath, path, commonAncestor);
+        return getLabel(adjustedPath, revision);
+    }
+
+    private String getAdjustedPath(String displayPath, String path1, String commonAncestor) {
+        String adjustedPath = getRelativePath(path1, commonAncestor);
+
+        if (adjustedPath == null || adjustedPath.length() == 0) {
+            adjustedPath = displayPath;
+        } else if (adjustedPath.charAt(0) == '/') {
+            adjustedPath = displayPath + "\t(..." + adjustedPath + ")";
+        } else {
+            adjustedPath = displayPath + "\t(.../" + adjustedPath + ")";
+        }
+        return adjustedPath;
+        //TODO: respect relativeToDir
+    }
+
+    protected String getLabel(String path, String revToken) {
+        revToken = revToken == null ? WC_REVISION_LABEL : revToken;
+        return path + "\t" + revToken;
+    }
+
+    protected boolean displayHeader(OutputStream os, String path, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation) throws SVNException {
+        try {
+            if (deleted && !isDiffDeleted()) {
+                displayString(os, "Index: ");
+                displayString(os, path);
+                displayString(os, " (deleted)");
+                displayEOL(os);
+                displayString(os, HEADER_SEPARATOR);
+                displayEOL(os);
+                return true;
+            }
+            if (added && !isDiffAdded()) {
+                displayString(os, "Index: ");
+                displayString(os, path);
+                displayString(os, " (added)");
+                displayEOL(os);
+                displayString(os, HEADER_SEPARATOR);
+                displayEOL(os);
+                return true;
+            }
+            displayString(os, "Index: ");
+            displayString(os, path);
+            displayEOL(os);
+            displayString(os, HEADER_SEPARATOR);
+            displayEOL(os);
+            return false;
+        } catch (IOException e) {
+            wrapException(e);
+        }
+        return false;
+    }
+
+    protected void displayHeaderFields(OutputStream os, String label1, String label2) throws SVNException {
+        try {
+            displayString(os, "--- ");
+            displayString(os, label1);
+            displayEOL(os);
+            displayString(os, "+++ ");
+            displayString(os, label2);
+            displayEOL(os);
+        } catch (IOException e) {
+            wrapException(e);
+        }
+    }
+
+    private void displayPropertyChangesOn(String path, OutputStream outputStream) throws SVNException {
+        try {
+            displayEOL(outputStream);
+            displayString(outputStream, ("Property changes on: " + (useLocalFileSeparatorChar() ? path.replace('/', File.separatorChar) : path)));
+            displayEOL(outputStream);
+            displayString(outputStream, PROPERTIES_SEPARATOR);
+            displayEOL(outputStream);
+        } catch (IOException e) {
+            wrapException(e);
+        }
+    }
+
+    private byte[] getPropertyAsBytes(SVNPropertyValue value, String encoding){
+        if (value == null){
+            return null;
+        }
+        if (value.isString()){
+            try {
+                return value.getString().getBytes(encoding);
+            } catch (UnsupportedEncodingException e) {
+                return value.getString().getBytes();
+            }
+        }
+        return value.getBytes();
+    }
+
+    private void displayMergeInfoDiff(OutputStream outputStream, String oldValue, String newValue) throws SVNException, IOException {
+        Map oldMergeInfo = null;
+        Map newMergeInfo = null;
+        if (oldValue != null) {
+            oldMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(oldValue), null);
+        }
+        if (newValue != null) {
+            newMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(newValue), null);
+        }
+
+        Map deleted = new TreeMap();
+        Map added = new TreeMap();
+        SVNMergeInfoUtil.diffMergeInfo(deleted, added, oldMergeInfo, newMergeInfo, true);
+
+        for (Iterator paths = deleted.keySet().iterator(); paths.hasNext();) {
+            String path = (String) paths.next();
+            SVNMergeRangeList rangeList = (SVNMergeRangeList) deleted.get(path);
+            displayString(outputStream, ("   Reverse-merged " + path + ":r"));
+            displayString(outputStream, rangeList.toString());
+            displayEOL(outputStream);
+        }
+
+        for (Iterator paths = added.keySet().iterator(); paths.hasNext();) {
+            String path = (String) paths.next();
+            SVNMergeRangeList rangeList = (SVNMergeRangeList) added.get(path);
+            displayString(outputStream, ("   Merged " + path + ":r"));
+            displayString(outputStream, rangeList.toString());
+            displayEOL(outputStream);
+        }
+    }
+
+    private boolean useLocalFileSeparatorChar() {
+        return true;
+    }
+
+    public boolean isDiffDeleted() {
+        return diffDeleted;
+    }
+
+    public boolean isDiffAdded() {
+        return diffAdded;
+    }
+
+    private void wrapException(IOException e) throws SVNException {
+        SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, e);
+        SVNErrorManager.error(errorMessage, e, SVNLogType.WC);
+    }
+
+    private void displayString(OutputStream outputStream, String s) throws IOException {
+        outputStream.write(s.getBytes(HEADER_ENCODING));
+    }
+
+    private void displayEOL(OutputStream os) throws IOException {
+        os.write(getEOL());
+    }
+
+    public SVNDiffOptions getDiffOptions() {
+        if (diffOptions == null) {
+            diffOptions = new SVNDiffOptions();
+        }
+        return diffOptions;
+    }
+
+    public void setExternalDiffCommand(String externalDiffCommand) {
+        this.externalDiffCommand = externalDiffCommand;
+    }
+
+    public void setRawDiffOptions(List<String> rawDiffOptions) {
+        this.rawDiffOptions = rawDiffOptions;
+    }
+
+    public void setDiffOptions(SVNDiffOptions diffOptions) {
+        this.diffOptions = diffOptions;
+    }
+
+    public void setDiffDeleted(boolean diffDeleted) {
+        this.diffDeleted = diffDeleted;
+    }
+
+    public void setDiffAdded(boolean diffAdded) {
+        this.diffAdded = diffAdded;
+    }
+
+    public void setBasePath(File absoluteFile) {
+        setBaseTarget(SvnTarget.fromFile(absoluteFile));
+    }
+
+    public void setFallbackToAbsolutePath(boolean fallbackToAbsolutePath) {
+        this.fallbackToAbsolutePath = fallbackToAbsolutePath;
+    }
+
+    public void setOptions(ISVNOptions options) {
+        this.options = options;
+    }
+
+    public ISVNOptions getOptions() {
+        return options;
+    }
+
+    private class EmptyDetectionOutputStream extends OutputStream {
+
+        private final OutputStream outputStream;
+        private boolean somethingWritten;
+
+        public EmptyDetectionOutputStream(OutputStream outputStream) {
+            this.outputStream = outputStream;
+            this.somethingWritten = false;
+        }
+
+        public boolean isSomethingWritten() {
+            return somethingWritten;
+        }
+
+        @Override
+        public void write(int c) throws IOException {
+            somethingWritten = true;
+            outputStream.write(c);
+        }
+
+        @Override
+        public void write(byte[] bytes) throws IOException {
+            somethingWritten = bytes.length > 0;
+            outputStream.write(bytes);
+        }
+
+        @Override
+        public void write(byte[] bytes, int offset, int length) throws IOException {
+            somethingWritten = length > 0;
+            outputStream.write(bytes, offset, length);
+        }
+
+        @Override
+        public void flush() throws IOException {
+            outputStream.flush();
+        }
+
+        @Override
+        public void close() throws IOException {
+            outputStream.close();
+        }
+    }
+}

From 7dfcc605309d817d84e5bf53fb5a376001a28104 Mon Sep 17 00:00:00 2001
From: Mohamed Karray <mohamed.karray.sr@gmail.com>
Date: Wed, 24 Oct 2018 13:07:11 +0200
Subject: [PATCH 014/188] copy the SvnDiffGenerator

---
 .../repository/spi/SCMSvnDiffGenerator.java   | 2083 ++++++++---------
 1 file changed, 1041 insertions(+), 1042 deletions(-)

diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
index c0e68bd4a0..f714a955c7 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
@@ -45,271 +45,271 @@ import java.util.TreeMap;
 
 public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
 
-    protected static final String WC_REVISION_LABEL = "(working copy)";
-    protected static final String PROPERTIES_SEPARATOR = "___________________________________________________________________";
-    protected static final String HEADER_SEPARATOR = "===================================================================";
-    protected static final String HEADER_ENCODING = "UTF-8";
+  protected static final String WC_REVISION_LABEL = "(working copy)";
+  protected static final String PROPERTIES_SEPARATOR = "___________________________________________________________________";
+  protected static final String HEADER_SEPARATOR = "===================================================================";
+  protected static final String HEADER_ENCODING = "UTF-8";
 
-    private SvnTarget originalTarget1;
-    private SvnTarget originalTarget2;
-    private SvnTarget baseTarget;
-    private SvnTarget relativeToTarget;
-    private SvnTarget repositoryRoot;
-    private String encoding;
-    private byte[] eol;
-    private boolean useGitFormat;
-    private boolean forcedBinaryDiff;
+  private SvnTarget originalTarget1;
+  private SvnTarget originalTarget2;
+  private SvnTarget baseTarget;
+  private SvnTarget relativeToTarget;
+  private SvnTarget repositoryRoot;
+  private String encoding;
+  private byte[] eol;
+  private boolean useGitFormat;
+  private boolean forcedBinaryDiff;
 
-    private boolean diffDeleted;
-    private boolean diffAdded;
-    private List<String> rawDiffOptions;
-    private boolean forceEmpty;
+  private boolean diffDeleted;
+  private boolean diffAdded;
+  private List<String> rawDiffOptions;
+  private boolean forceEmpty;
 
-    private Set<String> visitedPaths;
-    private String externalDiffCommand;
-    private SVNDiffOptions diffOptions;
-    private boolean fallbackToAbsolutePath;
-    private ISVNOptions options;
-    private boolean propertiesOnly;
-    private boolean ignoreProperties;
+  private Set<String> visitedPaths;
+  private String externalDiffCommand;
+  private SVNDiffOptions diffOptions;
+  private boolean fallbackToAbsolutePath;
+  private ISVNOptions options;
+  private boolean propertiesOnly;
+  private boolean ignoreProperties;
 
-    private String getDisplayPath(SvnTarget target) {
-        String relativePath;
-        if (baseTarget == null) {
-            relativePath = null;
-        } else {
-            String targetString = target.getPathOrUrlDecodedString();
-            String baseTargetString = baseTarget.getPathOrUrlDecodedString();
-            relativePath = getRelativePath(targetString, baseTargetString);
-        }
-
-        return relativePath != null ? relativePath : target.getPathOrUrlString();
+  private String getDisplayPath(SvnTarget target) {
+    String relativePath;
+    if (baseTarget == null) {
+      relativePath = null;
+    } else {
+      String targetString = target.getPathOrUrlDecodedString();
+      String baseTargetString = baseTarget.getPathOrUrlDecodedString();
+      relativePath = getRelativePath(targetString, baseTargetString);
     }
 
-    private String getRelativeToRootPath(SvnTarget target, SvnTarget originalTarget) {
-        String relativePath;
-        if (repositoryRoot == null) {
-            relativePath = null;
-        } else {
-            if (repositoryRoot.isFile() == target.isFile()) {
-                String targetString = target.getPathOrUrlDecodedString();
-                String baseTargetString = repositoryRoot.getPathOrUrlDecodedString();
-                relativePath = getRelativePath(targetString, baseTargetString);
-            } else {
-                String targetString = target.getPathOrUrlDecodedString();
-                String baseTargetString = new File("").getAbsolutePath();
-                relativePath = getRelativePath(targetString, baseTargetString);
-            }
-        }
+    return relativePath != null ? relativePath : target.getPathOrUrlString();
+  }
 
-        return relativePath != null ? relativePath : target.getPathOrUrlString();
+  private String getRelativeToRootPath(SvnTarget target, SvnTarget originalTarget) {
+    String relativePath;
+    if (repositoryRoot == null) {
+      relativePath = null;
+    } else {
+      if (repositoryRoot.isFile() == target.isFile()) {
+        String targetString = target.getPathOrUrlDecodedString();
+        String baseTargetString = repositoryRoot.getPathOrUrlDecodedString();
+        relativePath = getRelativePath(targetString, baseTargetString);
+      } else {
+        String targetString = target.getPathOrUrlDecodedString();
+        String baseTargetString = new File("").getAbsolutePath();
+        relativePath = getRelativePath(targetString, baseTargetString);
+      }
     }
 
-    private String getRelativePath(String targetString, String baseTargetString) {
-        if (targetString != null) {
-            targetString = targetString.replace(File.separatorChar, '/');
-        }
-        if (baseTargetString != null) {
-            baseTargetString = baseTargetString.replace(File.separatorChar, '/');
-        }
+    return relativePath != null ? relativePath : target.getPathOrUrlString();
+  }
 
-        final String pathAsChild = SVNPathUtil.getPathAsChild(baseTargetString, targetString);
-        if (pathAsChild != null) {
-            return pathAsChild;
-        }
-        if (targetString.equals(baseTargetString)) {
-            return "";
-        }
-        return null;
+  private String getRelativePath(String targetString, String baseTargetString) {
+    if (targetString != null) {
+      targetString = targetString.replace(File.separatorChar, '/');
+    }
+    if (baseTargetString != null) {
+      baseTargetString = baseTargetString.replace(File.separatorChar, '/');
     }
 
-    private String getChildPath(String path, String relativeToPath) {
-        if (relativeToTarget == null) {
-            return null;
-        }
+    final String pathAsChild = SVNPathUtil.getPathAsChild(baseTargetString, targetString);
+    if (pathAsChild != null) {
+      return pathAsChild;
+    }
+    if (targetString.equals(baseTargetString)) {
+      return "";
+    }
+    return null;
+  }
 
-        String relativePath = getRelativePath(path, relativeToPath);
-        if (relativePath == null) {
-            return path;
-        }
-
-        if (relativePath.length() > 0) {
-            return relativePath;
-        }
-
-        if (relativeToPath.equals(path)) {
-            return ".";
-        }
-
-        return null;
+  private String getChildPath(String path, String relativeToPath) {
+    if (relativeToTarget == null) {
+      return null;
     }
 
-    public SCMSvnDiffGenerator() {
-        this.originalTarget1 = null;
-        this.originalTarget2 = null;
-        this.visitedPaths = new HashSet<String>();
-        this.diffDeleted = true;
-        this.diffAdded = true;
+    String relativePath = getRelativePath(path, relativeToPath);
+    if (relativePath == null) {
+      return path;
     }
 
-    public void setBaseTarget(SvnTarget baseTarget) {
-        this.baseTarget = baseTarget;
+    if (relativePath.length() > 0) {
+      return relativePath;
     }
 
-    public void setUseGitFormat(boolean useGitFormat) {
-        this.useGitFormat = useGitFormat;
+    if (relativeToPath.equals(path)) {
+      return ".";
     }
 
-    public void setOriginalTargets(SvnTarget originalTarget1, SvnTarget originalTarget2) {
-        this.originalTarget1 = originalTarget1;
-        this.originalTarget2 = originalTarget2;
+    return null;
+  }
+
+  public SCMSvnDiffGenerator() {
+    this.originalTarget1 = null;
+    this.originalTarget2 = null;
+    this.visitedPaths = new HashSet<String>();
+    this.diffDeleted = true;
+    this.diffAdded = true;
+  }
+
+  public void setBaseTarget(SvnTarget baseTarget) {
+    this.baseTarget = baseTarget;
+  }
+
+  public void setUseGitFormat(boolean useGitFormat) {
+    this.useGitFormat = useGitFormat;
+  }
+
+  public void setOriginalTargets(SvnTarget originalTarget1, SvnTarget originalTarget2) {
+    this.originalTarget1 = originalTarget1;
+    this.originalTarget2 = originalTarget2;
+  }
+
+  public void setRelativeToTarget(SvnTarget relativeToTarget) {
+    this.relativeToTarget = relativeToTarget;
+  }
+
+  public void setAnchors(SvnTarget originalTarget1, SvnTarget originalTarget2) {
+    //anchors are not used
+  }
+
+  public void setRepositoryRoot(SvnTarget repositoryRoot) {
+    this.repositoryRoot = repositoryRoot;
+  }
+
+  public void setForceEmpty(boolean forceEmpty) {
+    this.forceEmpty = forceEmpty;
+  }
+
+  public void setEncoding(String encoding) {
+    this.encoding = encoding;
+  }
+
+  public String getEncoding() {
+    return encoding;
+  }
+
+  public String getGlobalEncoding() {
+    ISVNOptions options = getOptions();
+
+    if (options != null && options instanceof DefaultSVNOptions) {
+      DefaultSVNOptions defaultOptions = (DefaultSVNOptions) options;
+      return defaultOptions.getGlobalCharset();
+    }
+    return null;
+  }
+
+  public void setEOL(byte[] eol) {
+    this.eol = eol;
+  }
+
+  public byte[] getEOL() {
+    return eol;
+  }
+
+  public boolean isForcedBinaryDiff() {
+    return forcedBinaryDiff;
+  }
+
+  public void setForcedBinaryDiff(boolean forcedBinaryDiff) {
+    this.forcedBinaryDiff = forcedBinaryDiff;
+  }
+
+  public boolean isPropertiesOnly() {
+    return propertiesOnly;
+  }
+
+  public void setPropertiesOnly(boolean propertiesOnly) {
+    this.propertiesOnly = propertiesOnly;
+  }
+
+  public boolean isIgnoreProperties() {
+    return ignoreProperties;
+  }
+
+  public void setIgnoreProperties(boolean ignoreProperties) {
+    this.ignoreProperties = ignoreProperties;
+  }
+
+  public void displayDeletedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream) throws SVNException {
+  }
+
+  public void displayAddedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream) throws SVNException {
+  }
+
+  public void displayPropsChanged(SvnTarget target, String revision1, String revision2, boolean dirWasAdded, SVNProperties originalProps, SVNProperties propChanges, OutputStream outputStream) throws SVNException {
+    if (isIgnoreProperties()) {
+      return;
+    }
+    if (dirWasAdded && !isDiffAdded()) {
+      return;
+    }
+    ensureEncodingAndEOLSet();
+    String displayPath = getDisplayPath(target);
+
+    String targetString1 = originalTarget1.getPathOrUrlDecodedString();
+    String targetString2 = originalTarget2.getPathOrUrlDecodedString();
+
+    if (displayPath == null || displayPath.length() == 0) {
+      displayPath = ".";
     }
 
-    public void setRelativeToTarget(SvnTarget relativeToTarget) {
-        this.relativeToTarget = relativeToTarget;
+    if (useGitFormat) {
+      targetString1 = adjustRelativeToReposRoot(targetString1);
+      targetString2 = adjustRelativeToReposRoot(targetString2);
     }
 
-    public void setAnchors(SvnTarget originalTarget1, SvnTarget originalTarget2) {
-        //anchors are not used
+    String newTargetString = displayPath;
+    String newTargetString1 = targetString1;
+    String newTargetString2 = targetString2;
+
+    String commonAncestor = SVNPathUtil.getCommonPathAncestor(newTargetString1, newTargetString2);
+    int commonLength = commonAncestor == null ? 0 : commonAncestor.length();
+
+    newTargetString1 = newTargetString1.substring(commonLength);
+    newTargetString2 = newTargetString2.substring(commonLength);
+
+    newTargetString1 = computeLabel(newTargetString, newTargetString1);
+    newTargetString2 = computeLabel(newTargetString, newTargetString2);
+
+    if (relativeToTarget != null) {
+      String relativeToPath = relativeToTarget.getPathOrUrlDecodedString();
+      String absolutePath = target.getPathOrUrlDecodedString();
+
+      String childPath = getChildPath(absolutePath, relativeToPath);
+      if (childPath == null) {
+        throwBadRelativePathException(absolutePath, relativeToPath);
+      }
+      String childPath1 = getChildPath(newTargetString1, relativeToPath);
+      if (childPath1 == null) {
+        throwBadRelativePathException(newTargetString1, relativeToPath);
+      }
+      String childPath2 = getChildPath(newTargetString2, relativeToPath);
+      if (childPath2 == null) {
+        throwBadRelativePathException(newTargetString2, relativeToPath);
+      }
+
+      displayPath = childPath;
+      newTargetString1 = childPath1;
+      newTargetString2 = childPath2;
     }
 
-    public void setRepositoryRoot(SvnTarget repositoryRoot) {
-        this.repositoryRoot = repositoryRoot;
-    }
+    boolean showDiffHeader = !visitedPaths.contains(displayPath);
+    if (showDiffHeader) {
+      String label1 = getLabel(newTargetString1, revision1);
+      String label2 = getLabel(newTargetString2, revision2);
 
-    public void setForceEmpty(boolean forceEmpty) {
-        this.forceEmpty = forceEmpty;
-    }
-
-    public void setEncoding(String encoding) {
-        this.encoding = encoding;
-    }
-
-    public String getEncoding() {
-        return encoding;
-    }
-
-    public String getGlobalEncoding() {
-        ISVNOptions options = getOptions();
-
-        if (options != null && options instanceof DefaultSVNOptions) {
-            DefaultSVNOptions defaultOptions = (DefaultSVNOptions) options;
-            return defaultOptions.getGlobalCharset();
-        }
-        return null;
-    }
-
-    public void setEOL(byte[] eol) {
-        this.eol = eol;
-    }
-
-    public byte[] getEOL() {
-        return eol;
-    }
-
-    public boolean isForcedBinaryDiff() {
-        return forcedBinaryDiff;
-    }
-
-    public void setForcedBinaryDiff(boolean forcedBinaryDiff) {
-        this.forcedBinaryDiff = forcedBinaryDiff;
-    }
-
-    public boolean isPropertiesOnly() {
-        return propertiesOnly;
-    }
-
-    public void setPropertiesOnly(boolean propertiesOnly) {
-        this.propertiesOnly = propertiesOnly;
-    }
-
-    public boolean isIgnoreProperties() {
-        return ignoreProperties;
-    }
-
-    public void setIgnoreProperties(boolean ignoreProperties) {
-        this.ignoreProperties = ignoreProperties;
-    }
-
-    public void displayDeletedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream) throws SVNException {
-    }
-
-    public void displayAddedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream) throws SVNException {
-    }
-
-    public void displayPropsChanged(SvnTarget target, String revision1, String revision2, boolean dirWasAdded, SVNProperties originalProps, SVNProperties propChanges, OutputStream outputStream) throws SVNException {
-        if (isIgnoreProperties()) {
-            return;
-        }
-        if (dirWasAdded && !isDiffAdded()) {
-            return;
-        }
-        ensureEncodingAndEOLSet();
-        String displayPath = getDisplayPath(target);
-
-        String targetString1 = originalTarget1.getPathOrUrlDecodedString();
-        String targetString2 = originalTarget2.getPathOrUrlDecodedString();
-
-        if (displayPath == null || displayPath.length() == 0) {
-            displayPath = ".";
-        }
-
-        if (useGitFormat) {
-            targetString1 = adjustRelativeToReposRoot(targetString1);
-            targetString2 = adjustRelativeToReposRoot(targetString2);
-        }
-
-        String newTargetString = displayPath;
-        String newTargetString1 = targetString1;
-        String newTargetString2 = targetString2;
-
-        String commonAncestor = SVNPathUtil.getCommonPathAncestor(newTargetString1, newTargetString2);
-        int commonLength = commonAncestor == null ? 0 : commonAncestor.length();
-
-        newTargetString1 = newTargetString1.substring(commonLength);
-        newTargetString2 = newTargetString2.substring(commonLength);
-
-        newTargetString1 = computeLabel(newTargetString, newTargetString1);
-        newTargetString2 = computeLabel(newTargetString, newTargetString2);
-
-        if (relativeToTarget != null) {
-            String relativeToPath = relativeToTarget.getPathOrUrlDecodedString();
-            String absolutePath = target.getPathOrUrlDecodedString();
-
-            String childPath = getChildPath(absolutePath, relativeToPath);
-            if (childPath == null) {
-                throwBadRelativePathException(absolutePath, relativeToPath);
-            }
-            String childPath1 = getChildPath(newTargetString1, relativeToPath);
-            if (childPath1 == null) {
-                throwBadRelativePathException(newTargetString1, relativeToPath);
-            }
-            String childPath2 = getChildPath(newTargetString2, relativeToPath);
-            if (childPath2 == null) {
-                throwBadRelativePathException(newTargetString2, relativeToPath);
-            }
-
-            displayPath = childPath;
-            newTargetString1 = childPath1;
-            newTargetString2 = childPath2;
-        }
-
-        boolean showDiffHeader = !visitedPaths.contains(displayPath);
-        if (showDiffHeader) {
-            String label1 = getLabel(newTargetString1, revision1);
-            String label2 = getLabel(newTargetString2, revision2);
-
-            boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, false, fallbackToAbsolutePath, SvnDiffCallback.OperationKind.Modified);
-            visitedPaths.add(displayPath);
-            if (useGitFormat) {
-                displayGitDiffHeader(outputStream, SvnDiffCallback.OperationKind.Modified,
-                        getRelativeToRootPath(target, originalTarget1),
-                        getRelativeToRootPath(target, originalTarget2),
-                        null);
-            }
-            if (shouldStopDisplaying) {
-                return;
-            }
+      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, false, fallbackToAbsolutePath, SvnDiffCallback.OperationKind.Modified);
+      visitedPaths.add(displayPath);
+      if (useGitFormat) {
+        displayGitDiffHeader(outputStream, SvnDiffCallback.OperationKind.Modified,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          null);
+      }
+      if (shouldStopDisplaying) {
+        return;
+      }
 
 //            if (useGitFormat) {
 //                String copyFromPath = null;
@@ -322,910 +322,909 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
 //                        copyFromPath);
 //            }
 
-            if (useGitFormat) {
-                displayGitHeaderFields(outputStream, target, revision1, revision2, SvnDiffCallback.OperationKind.Modified, null);
-            } else {
-                displayHeaderFields(outputStream, label1, label2);
-            }
-        }
-
-        displayPropertyChangesOn(useGitFormat ? getRelativeToRootPath(target, originalTarget1) : displayPath, outputStream);
-
-        displayPropDiffValues(outputStream, propChanges, originalProps);
+      if (useGitFormat) {
+        displayGitHeaderFields(outputStream, target, revision1, revision2, SvnDiffCallback.OperationKind.Modified, null);
+      } else {
+        displayHeaderFields(outputStream, label1, label2);
+      }
     }
 
-    private void throwBadRelativePathException(String displayPath, String relativeToPath) throws SVNException {
-        SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.BAD_RELATIVE_PATH, "Path ''{0}'' must be an immediate child of the directory ''{0}''",
-                displayPath, relativeToPath);
-        SVNErrorManager.error(errorMessage, SVNLogType.CLIENT);
+    displayPropertyChangesOn(useGitFormat ? getRelativeToRootPath(target, originalTarget1) : displayPath, outputStream);
+
+    displayPropDiffValues(outputStream, propChanges, originalProps);
+  }
+
+  private void throwBadRelativePathException(String displayPath, String relativeToPath) throws SVNException {
+    SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.BAD_RELATIVE_PATH, "Path ''{0}'' must be an immediate child of the directory ''{0}''",
+      displayPath, relativeToPath);
+    SVNErrorManager.error(errorMessage, SVNLogType.CLIENT);
+  }
+
+  private void displayGitHeaderFields(OutputStream outputStream, SvnTarget target, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+    String path1 = copyFromPath != null ? copyFromPath : getRelativeToRootPath(target, originalTarget1);
+    String path2 = getRelativeToRootPath(target, originalTarget2);
+
+    try {
+      displayString(outputStream, "--- ");
+      displayFirstGitLabelPath(outputStream, path1, revision1, operation);
+      displayEOL(outputStream);
+      displayString(outputStream, "+++ ");
+      displaySecondGitLabelPath(outputStream, path2, revision2, operation);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private String adjustRelativeToReposRoot(String targetString) {
+    if (repositoryRoot != null) {
+      String repositoryRootString = repositoryRoot.getPathOrUrlDecodedString();
+      String relativePath = getRelativePath(targetString, repositoryRootString);
+      return relativePath == null ? "" : relativePath;
+    }
+    return targetString;
+  }
+
+  private String computeLabel(String targetString, String originalTargetString) {
+    if (originalTargetString.length() == 0) {
+      return targetString;
+    } else if (originalTargetString.charAt(0) == '/') {
+      return targetString + "\t(..." + originalTargetString + ")";
+    } else {
+      return targetString + "\t(.../" + originalTargetString + ")";
+    }
+  }
+
+  public void displayContentChanged(SvnTarget target, File leftFile, File rightFile, String revision1, String revision2, String mimeType1, String mimeType2, SvnDiffCallback.OperationKind operation, File copyFromPath, SVNProperties originalProperties, SVNProperties propChanges, OutputStream outputStream) throws SVNException {
+    if (isPropertiesOnly()) {
+      return;
+    }
+    ensureEncodingAndEOLSet();
+    String displayPath = getDisplayPath(target);
+
+    String targetString1 = originalTarget1.getPathOrUrlDecodedString();
+    String targetString2 = originalTarget2.getPathOrUrlDecodedString();
+
+    if (useGitFormat) {
+      targetString1 = adjustRelativeToReposRoot(targetString1);
+      targetString2 = adjustRelativeToReposRoot(targetString2);
     }
 
-    private void displayGitHeaderFields(OutputStream outputStream, SvnTarget target, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
-        String path1 = copyFromPath != null ? copyFromPath : getRelativeToRootPath(target, originalTarget1);
-        String path2 = getRelativeToRootPath(target, originalTarget2);
+    String newTargetString = displayPath;
+    String newTargetString1 = targetString1;
+    String newTargetString2 = targetString2;
 
-        try {
-            displayString(outputStream, "--- ");
-            displayFirstGitLabelPath(outputStream, path1, revision1, operation);
-            displayEOL(outputStream);
-            displayString(outputStream, "+++ ");
-            displaySecondGitLabelPath(outputStream, path2, revision2, operation);
-            displayEOL(outputStream);
-        } catch (IOException e) {
-            wrapException(e);
-        }
+    String commonAncestor = SVNPathUtil.getCommonPathAncestor(newTargetString1, newTargetString2);
+    int commonLength = commonAncestor == null ? 0 : commonAncestor.length();
+
+    newTargetString1 = newTargetString1.substring(commonLength);
+    newTargetString2 = newTargetString2.substring(commonLength);
+
+    newTargetString1 = computeLabel(newTargetString, newTargetString1);
+    newTargetString2 = computeLabel(newTargetString, newTargetString2);
+
+    if (relativeToTarget != null) {
+      String relativeToPath = relativeToTarget.getPathOrUrlDecodedString();
+      String absolutePath = target.getPathOrUrlDecodedString();
+
+      String childPath = getChildPath(absolutePath, relativeToPath);
+      if (childPath == null) {
+        throwBadRelativePathException(absolutePath, relativeToPath);
+      }
+      String childPath1 = getChildPath(newTargetString1, relativeToPath);
+      if (childPath1 == null) {
+        throwBadRelativePathException(newTargetString1, relativeToPath);
+      }
+      String childPath2 = getChildPath(newTargetString2, relativeToPath);
+      if (childPath2 == null) {
+        throwBadRelativePathException(newTargetString2, relativeToPath);
+      }
+
+      displayPath = childPath;
+      newTargetString1 = childPath1;
+      newTargetString2 = childPath2;
     }
 
-    private String adjustRelativeToReposRoot(String targetString) {
-        if (repositoryRoot != null) {
-            String repositoryRootString = repositoryRoot.getPathOrUrlDecodedString();
-            String relativePath = getRelativePath(targetString, repositoryRootString);
-            return relativePath == null ? "" : relativePath;
-        }
-        return targetString;
+    String label1 = getLabel(newTargetString1, revision1);
+    String label2 = getLabel(newTargetString2, revision2);
+
+    boolean leftIsBinary = false;
+    boolean rightIsBinary = false;
+
+    if (mimeType1 != null) {
+      leftIsBinary = SVNProperty.isBinaryMimeType(mimeType1);
+    }
+    if (mimeType2 != null) {
+      rightIsBinary = SVNProperty.isBinaryMimeType(mimeType2);
     }
 
-    private String computeLabel(String targetString, String originalTargetString) {
-        if (originalTargetString.length() == 0) {
-            return targetString;
-        } else if (originalTargetString.charAt(0) == '/') {
-            return targetString + "\t(..." + originalTargetString + ")";
-        } else {
-            return targetString + "\t(.../" + originalTargetString + ")";
-        }
+    if (!forcedBinaryDiff && (leftIsBinary || rightIsBinary)) {
+      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
+      if (useGitFormat) {
+        displayGitDiffHeader(outputStream, operation,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          null);
+      }
+      visitedPaths.add(displayPath);
+      if (shouldStopDisplaying) {
+        return;
+      }
+
+
+      displayBinary(mimeType1, mimeType2, outputStream, leftIsBinary, rightIsBinary);
+
+      return;
     }
 
-    public void displayContentChanged(SvnTarget target, File leftFile, File rightFile, String revision1, String revision2, String mimeType1, String mimeType2, SvnDiffCallback.OperationKind operation, File copyFromPath, SVNProperties originalProperties, SVNProperties propChanges, OutputStream outputStream) throws SVNException {
-        if (isPropertiesOnly()) {
-            return;
-        }
-        ensureEncodingAndEOLSet();
-        String displayPath = getDisplayPath(target);
+    final String diffCommand = getExternalDiffCommand();
+    if (diffCommand != null) {
+      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
+      if (useGitFormat) {
+        displayGitDiffHeader(outputStream, operation,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          null);
+      }
+      visitedPaths.add(displayPath);
+      if (shouldStopDisplaying) {
+        return;
+      }
 
-        String targetString1 = originalTarget1.getPathOrUrlDecodedString();
-        String targetString2 = originalTarget2.getPathOrUrlDecodedString();
+      runExternalDiffCommand(outputStream, diffCommand, leftFile, rightFile, label1, label2);
+    } else {
+      internalDiff(target, outputStream, displayPath, leftFile, rightFile, label1, label2, operation, copyFromPath == null ? null : copyFromPath.getPath(), revision1, revision2);
+    }
+  }
 
-        if (useGitFormat) {
-            targetString1 = adjustRelativeToReposRoot(targetString1);
-            targetString2 = adjustRelativeToReposRoot(targetString2);
-        }
+  private void displayBinary(String mimeType1, String mimeType2, OutputStream outputStream, boolean leftIsBinary, boolean rightIsBinary) throws SVNException {
+    displayCannotDisplayFileMarkedBinary(outputStream);
 
-        String newTargetString = displayPath;
-        String newTargetString1 = targetString1;
-        String newTargetString2 = targetString2;
+    if (leftIsBinary && !rightIsBinary) {
+      displayMimeType(outputStream, mimeType1);
+    } else if (!leftIsBinary && rightIsBinary) {
+      displayMimeType(outputStream, mimeType2);
+    } else if (leftIsBinary && rightIsBinary) {
+      if (mimeType1.equals(mimeType2)) {
+        displayMimeType(outputStream, mimeType1);
+      } else {
+        displayMimeTypes(outputStream, mimeType1, mimeType2);
+      }
+    }
+  }
 
-        String commonAncestor = SVNPathUtil.getCommonPathAncestor(newTargetString1, newTargetString2);
-        int commonLength = commonAncestor == null ? 0 : commonAncestor.length();
+  private void internalDiff(SvnTarget target, OutputStream outputStream, String displayPath, File file1, File file2, String label1, String label2, SvnDiffCallback.OperationKind operation, String copyFromPath, String revision1, String revision2) throws SVNException {
+    String header = getHeaderString(target, displayPath, file2 == null, file1 == null, operation, copyFromPath);
+    if (file2 == null && !isDiffDeleted()) {
+      try {
+        displayString(outputStream, header);
+      } catch (IOException e) {
+        wrapException(e);
+      }
+      visitedPaths.add(displayPath);
+      return;
+    }
+    if (file1 == null && !isDiffAdded()) {
+      try {
+        displayString(outputStream, header);
+      } catch (IOException e) {
+        wrapException(e);
+      }
+      visitedPaths.add(displayPath);
+      return;
+    }
+    String headerFields = getHeaderFieldsString(target, displayPath, label1, label2, revision1, revision2, operation, copyFromPath);
 
-        newTargetString1 = newTargetString1.substring(commonLength);
-        newTargetString2 = newTargetString2.substring(commonLength);
+    RandomAccessFile is1 = null;
+    RandomAccessFile is2 = null;
+    try {
+      is1 = file1 == null ? null : SVNFileUtil.openRAFileForReading(file1);
+      is2 = file2 == null ? null : SVNFileUtil.openRAFileForReading(file2);
 
-        newTargetString1 = computeLabel(newTargetString, newTargetString1);
-        newTargetString2 = computeLabel(newTargetString, newTargetString2);
+      QDiffUniGenerator.setup();
+      Map properties = new SVNHashMap();
 
-            if (relativeToTarget != null) {
-                String relativeToPath = relativeToTarget.getPathOrUrlDecodedString();
-                String absolutePath = target.getPathOrUrlDecodedString();
+      properties.put(QDiffGeneratorFactory.IGNORE_EOL_PROPERTY, Boolean.valueOf(getDiffOptions().isIgnoreEOLStyle()));
+      properties.put(QDiffGeneratorFactory.EOL_PROPERTY, new String(getEOL()));
+      if (getDiffOptions().isIgnoreAllWhitespace()) {
+        properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_ALL_SPACE);
+      } else if (getDiffOptions().isIgnoreAmountOfWhitespace()) {
+        properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_SPACE_CHANGE);
+      }
 
-                String childPath = getChildPath(absolutePath, relativeToPath);
-                if (childPath == null) {
-                    throwBadRelativePathException(absolutePath, relativeToPath);
-                }
-                String childPath1 = getChildPath(newTargetString1, relativeToPath);
-                if (childPath1 == null) {
-                    throwBadRelativePathException(newTargetString1, relativeToPath);
-                }
-                String childPath2 = getChildPath(newTargetString2, relativeToPath);
-                if (childPath2 == null) {
-                    throwBadRelativePathException(newTargetString2, relativeToPath);
-                }
+      final String diffHeader;
+      if (forceEmpty || useGitFormat) {
+        displayString(outputStream, header);
+        diffHeader = headerFields;
 
-                displayPath = childPath;
-                newTargetString1 = childPath1;
-                newTargetString2 = childPath2;
-            }
+        visitedPaths.add(displayPath);
+      } else {
+        diffHeader = header + headerFields;
+      }
+      QDiffGenerator generator = new QDiffUniGenerator(properties, diffHeader);
+      EmptyDetectionOutputStream emptyDetectionOutputStream = new EmptyDetectionOutputStream(outputStream);
+      QDiffManager.generateTextDiff(is1, is2, emptyDetectionOutputStream, generator);
+      if (emptyDetectionOutputStream.isSomethingWritten()) {
+        visitedPaths.add(displayPath);
+      }
+      emptyDetectionOutputStream.flush();
+    } catch (IOException e) {
+      SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, e.getMessage());
+      SVNErrorManager.error(err, e, SVNLogType.DEFAULT);
+    } finally {
+      SVNFileUtil.closeFile(is1);
+      SVNFileUtil.closeFile(is2);
+    }
+  }
 
-        String label1 = getLabel(newTargetString1, revision1);
-        String label2 = getLabel(newTargetString2, revision2);
+  private String getHeaderFieldsString(SvnTarget target, String displayPath, String label1, String label2, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+    final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    try {
+      if (useGitFormat) {
+        displayGitHeaderFields(byteArrayOutputStream, target, revision1, revision2, operation, copyFromPath);
+      } else {
+        displayHeaderFields(byteArrayOutputStream, label1, label2);
+      }
+    } catch (SVNException e) {
+      SVNFileUtil.closeFile(byteArrayOutputStream);
 
-        boolean leftIsBinary = false;
-        boolean rightIsBinary = false;
+      try {
+        byteArrayOutputStream.writeTo(byteArrayOutputStream);
+      } catch (IOException e1) {
+      }
 
-        if (mimeType1 != null) {
-            leftIsBinary = SVNProperty.isBinaryMimeType(mimeType1);
-        }
-        if (mimeType2 != null) {
-            rightIsBinary = SVNProperty.isBinaryMimeType(mimeType2);
-        }
-
-        if (!forcedBinaryDiff && (leftIsBinary || rightIsBinary)) {
-            boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
-            if (useGitFormat) {
-                displayGitDiffHeader(outputStream, operation,
-                        getRelativeToRootPath(target, originalTarget1),
-                        getRelativeToRootPath(target, originalTarget2),
-                        null);
-            }
-            visitedPaths.add(displayPath);
-            if (shouldStopDisplaying) {
-                return;
-            }
-
-
-
-            displayBinary(mimeType1, mimeType2, outputStream, leftIsBinary, rightIsBinary);
-
-            return;
-        }
-
-        final String diffCommand = getExternalDiffCommand();
-        if (diffCommand != null) {
-            boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
-            if (useGitFormat) {
-                displayGitDiffHeader(outputStream, operation,
-                        getRelativeToRootPath(target, originalTarget1),
-                        getRelativeToRootPath(target, originalTarget2),
-                        null);
-            }
-            visitedPaths.add(displayPath);
-            if (shouldStopDisplaying) {
-                return;
-            }
-
-            runExternalDiffCommand(outputStream, diffCommand, leftFile, rightFile, label1, label2);
-        } else {
-            internalDiff(target, outputStream, displayPath, leftFile, rightFile, label1, label2, operation, copyFromPath == null ? null : copyFromPath.getPath(), revision1, revision2);
-        }
+      throw e;
     }
 
-    private void displayBinary(String mimeType1, String mimeType2, OutputStream outputStream, boolean leftIsBinary, boolean rightIsBinary) throws SVNException {
-        displayCannotDisplayFileMarkedBinary(outputStream);
+    try {
+      byteArrayOutputStream.close();
+      return byteArrayOutputStream.toString(HEADER_ENCODING);
+    } catch (IOException e) {
+      return "";
+    }
+  }
 
-        if (leftIsBinary && !rightIsBinary) {
-            displayMimeType(outputStream, mimeType1);
-        } else if (!leftIsBinary && rightIsBinary) {
-            displayMimeType(outputStream, mimeType2);
-        } else if (leftIsBinary && rightIsBinary) {
-            if (mimeType1.equals(mimeType2)) {
-                displayMimeType(outputStream, mimeType1);
-            } else {
-                displayMimeTypes(outputStream, mimeType1, mimeType2);
-            }
-        }
+  private String getHeaderString(SvnTarget target, String displayPath, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+    final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    try {
+      boolean stopDisplaying = displayHeader(byteArrayOutputStream, displayPath, deleted, added, operation);
+      if (useGitFormat) {
+        displayGitDiffHeader(byteArrayOutputStream, operation,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          copyFromPath);
+      }
+    } catch (SVNException e) {
+      SVNFileUtil.closeFile(byteArrayOutputStream);
+
+      try {
+        byteArrayOutputStream.writeTo(byteArrayOutputStream);
+      } catch (IOException e1) {
+      }
+
+      throw e;
     }
 
-    private void internalDiff(SvnTarget target, OutputStream outputStream, String displayPath, File file1, File file2, String label1, String label2, SvnDiffCallback.OperationKind operation, String copyFromPath, String revision1, String revision2) throws SVNException {
-        String header = getHeaderString(target, displayPath, file2 == null, file1 == null, operation, copyFromPath);
-        if (file2 == null && !isDiffDeleted()) {
+    try {
+      byteArrayOutputStream.close();
+      return byteArrayOutputStream.toString(HEADER_ENCODING);
+    } catch (IOException e) {
+      return "";
+    }
+  }
+
+  private void runExternalDiffCommand(OutputStream outputStream, final String diffCommand, File file1, File file2, String label1, String label2) throws SVNException {
+    final List<String> args = new ArrayList<String>();
+    args.add(diffCommand);
+    if (rawDiffOptions != null) {
+      args.addAll(rawDiffOptions);
+    } else {
+      Collection svnDiffOptionsCollection = getDiffOptions().toOptionsCollection();
+      args.addAll(svnDiffOptionsCollection);
+      args.add("-u");
+    }
+
+    if (label1 != null) {
+      args.add("-L");
+      args.add(label1);
+    }
+
+    if (label2 != null) {
+      args.add("-L");
+      args.add(label2);
+    }
+
+    boolean tmpFile1 = false;
+    boolean tmpFile2 = false;
+    if (file1 == null) {
+      file1 = SVNFileUtil.createTempFile("svn.", ".tmp");
+      tmpFile1 = true;
+    }
+    if (file2 == null) {
+      file2 = SVNFileUtil.createTempFile("svn.", ".tmp");
+      tmpFile2 = true;
+    }
+
+    String file1Path = file1.getAbsolutePath().replace(File.separatorChar, '/');
+    String file2Path = file2.getAbsolutePath().replace(File.separatorChar, '/');
+
+    args.add(file1Path);
+    args.add(file2Path);
+    try {
+      final Writer writer = new OutputStreamWriter(outputStream, getEncoding());
+
+      SVNFileUtil.execCommand(args.toArray(new String[args.size()]), true,
+        new ISVNReturnValueCallback() {
+
+          public void handleReturnValue(int returnValue) throws SVNException {
+            if (returnValue != 0 && returnValue != 1) {
+              SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.EXTERNAL_PROGRAM,
+                "''{0}'' returned {1}", new Object[]{diffCommand, String.valueOf(returnValue)});
+              SVNErrorManager.error(err, SVNLogType.DEFAULT);
+            }
+          }
+
+          public void handleChar(char ch) throws SVNException {
             try {
-                displayString(outputStream, header);
-            } catch (IOException e) {
-                wrapException(e);
-            }
-            visitedPaths.add(displayPath);
-            return;
-        }
-        if (file1 == null && !isDiffAdded()) {
-            try {
-                displayString(outputStream, header);
-            } catch (IOException e) {
-                wrapException(e);
-            }
-            visitedPaths.add(displayPath);
-            return;
-        }
-        String headerFields = getHeaderFieldsString(target, displayPath, label1, label2, revision1, revision2, operation, copyFromPath);
-
-        RandomAccessFile is1 = null;
-        RandomAccessFile is2 = null;
-        try {
-            is1 = file1 == null ? null : SVNFileUtil.openRAFileForReading(file1);
-            is2 = file2 == null ? null : SVNFileUtil.openRAFileForReading(file2);
-
-            QDiffUniGenerator.setup();
-            Map properties = new SVNHashMap();
-
-            properties.put(QDiffGeneratorFactory.IGNORE_EOL_PROPERTY, Boolean.valueOf(getDiffOptions().isIgnoreEOLStyle()));
-            properties.put(QDiffGeneratorFactory.EOL_PROPERTY, new String(getEOL()));
-            if (getDiffOptions().isIgnoreAllWhitespace()) {
-                properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_ALL_SPACE);
-            } else if (getDiffOptions().isIgnoreAmountOfWhitespace()) {
-                properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_SPACE_CHANGE);
-            }
-
-            final String diffHeader;
-            if (forceEmpty || useGitFormat) {
-                displayString(outputStream, header);
-                diffHeader = headerFields;
-
-                visitedPaths.add(displayPath);
-            } else {
-                diffHeader = header + headerFields;
-            }
-            QDiffGenerator generator = new QDiffUniGenerator(properties, diffHeader);
-            EmptyDetectionOutputStream emptyDetectionOutputStream = new EmptyDetectionOutputStream(outputStream);
-            QDiffManager.generateTextDiff(is1, is2, emptyDetectionOutputStream, generator);
-            if (emptyDetectionOutputStream.isSomethingWritten()) {
-                visitedPaths.add(displayPath);
-            }
-            emptyDetectionOutputStream.flush();
-        } catch (IOException e) {
-            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, e.getMessage());
-            SVNErrorManager.error(err, e, SVNLogType.DEFAULT);
-        } finally {
-            SVNFileUtil.closeFile(is1);
-            SVNFileUtil.closeFile(is2);
-        }
-    }
-
-    private String getHeaderFieldsString(SvnTarget target, String displayPath, String label1, String label2, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
-        final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        try {
-            if (useGitFormat) {
-                displayGitHeaderFields(byteArrayOutputStream, target, revision1, revision2, operation, copyFromPath);
-            } else {
-                displayHeaderFields(byteArrayOutputStream, label1, label2);
-            }
-        } catch (SVNException e) {
-            SVNFileUtil.closeFile(byteArrayOutputStream);
-
-            try {
-                byteArrayOutputStream.writeTo(byteArrayOutputStream);
-            } catch (IOException e1) {
-            }
-
-            throw e;
-        }
-
-        try {
-            byteArrayOutputStream.close();
-            return byteArrayOutputStream.toString(HEADER_ENCODING);
-        } catch (IOException e) {
-            return "";
-        }
-    }
-
-    private String getHeaderString(SvnTarget target, String displayPath, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
-        final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        try {
-            boolean stopDisplaying = displayHeader(byteArrayOutputStream, displayPath, deleted, added, operation);
-            if (useGitFormat) {
-                displayGitDiffHeader(byteArrayOutputStream, operation,
-                        getRelativeToRootPath(target, originalTarget1),
-                        getRelativeToRootPath(target, originalTarget2),
-                        copyFromPath);
-            }
-        } catch (SVNException e) {
-            SVNFileUtil.closeFile(byteArrayOutputStream);
-
-            try {
-                byteArrayOutputStream.writeTo(byteArrayOutputStream);
-            } catch (IOException e1) {
-            }
-
-            throw e;
-        }
-
-        try {
-            byteArrayOutputStream.close();
-            return byteArrayOutputStream.toString(HEADER_ENCODING);
-        } catch (IOException e) {
-            return "";
-        }
-    }
-
-    private void runExternalDiffCommand(OutputStream outputStream, final String diffCommand, File file1, File file2, String label1, String label2) throws SVNException {
-        final List<String> args = new ArrayList<String>();
-        args.add(diffCommand);
-        if (rawDiffOptions != null) {
-            args.addAll(rawDiffOptions);
-        } else {
-            Collection svnDiffOptionsCollection = getDiffOptions().toOptionsCollection();
-            args.addAll(svnDiffOptionsCollection);
-            args.add("-u");
-        }
-
-        if (label1 != null) {
-            args.add("-L");
-            args.add(label1);
-        }
-
-        if (label2 != null) {
-            args.add("-L");
-            args.add(label2);
-        }
-
-        boolean tmpFile1 = false;
-        boolean tmpFile2 = false;
-        if (file1 == null) {
-            file1 = SVNFileUtil.createTempFile("svn.", ".tmp");
-            tmpFile1 = true;
-        }
-        if (file2 == null) {
-            file2 = SVNFileUtil.createTempFile("svn.", ".tmp");
-            tmpFile2 = true;
-        }
-
-        String file1Path = file1.getAbsolutePath().replace(File.separatorChar, '/');
-        String file2Path = file2.getAbsolutePath().replace(File.separatorChar, '/');
-
-        args.add(file1Path);
-        args.add(file2Path);
-            try {
-                final Writer writer = new OutputStreamWriter(outputStream, getEncoding());
-
-                SVNFileUtil.execCommand(args.toArray(new String[args.size()]), true,
-                        new ISVNReturnValueCallback() {
-
-                    public void handleReturnValue(int returnValue) throws SVNException {
-                        if (returnValue != 0 && returnValue != 1) {
-                            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.EXTERNAL_PROGRAM,
-                                    "''{0}'' returned {1}", new Object[] { diffCommand, String.valueOf(returnValue) });
-                            SVNErrorManager.error(err, SVNLogType.DEFAULT);
-                        }
-                    }
-
-                    public void handleChar(char ch) throws SVNException {
-                        try {
-                            writer.write(ch);
-                        } catch (IOException ioe) {
-                            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, ioe.getMessage());
-                            SVNErrorManager.error(err, ioe, SVNLogType.DEFAULT);
-                        }
-                    }
-
-                    public boolean isHandleProgramOutput() {
-                        return true;
-                    }
-                });
-
-                writer.flush();
+              writer.write(ch);
             } catch (IOException ioe) {
-                SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, ioe.getMessage());
-                SVNErrorManager.error(err, ioe, SVNLogType.DEFAULT);
-            } finally {
-                try {
-                    if (tmpFile1) {
-                        SVNFileUtil.deleteFile(file1);
-                    }
-                    if (tmpFile2) {
-                        SVNFileUtil.deleteFile(file2);
-                    }
-                } catch (SVNException e) {
-                    // skip
-                }
+              SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, ioe.getMessage());
+              SVNErrorManager.error(err, ioe, SVNLogType.DEFAULT);
             }
-    }
+          }
 
-    private String getExternalDiffCommand() {
-        return externalDiffCommand;
-    }
+          public boolean isHandleProgramOutput() {
+            return true;
+          }
+        });
 
-    private void displayMimeType(OutputStream outputStream, String mimeType) throws SVNException {
-        try {
-            displayString(outputStream, SVNProperty.MIME_TYPE);
-            displayString(outputStream, " = ");
-            displayString(outputStream, mimeType);
-            displayEOL(outputStream);
-        } catch (IOException e) {
-            wrapException(e);
+      writer.flush();
+    } catch (IOException ioe) {
+      SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, ioe.getMessage());
+      SVNErrorManager.error(err, ioe, SVNLogType.DEFAULT);
+    } finally {
+      try {
+        if (tmpFile1) {
+          SVNFileUtil.deleteFile(file1);
         }
-    }
-
-    private void displayMimeTypes(OutputStream outputStream, String mimeType1, String mimeType2) throws SVNException {
-        try {
-            displayString(outputStream, SVNProperty.MIME_TYPE);
-            displayString(outputStream, " = (");
-            displayString(outputStream, mimeType1);
-            displayString(outputStream, ", ");
-            displayString(outputStream, mimeType2);
-            displayString(outputStream, ")");
-            displayEOL(outputStream);
-        } catch (IOException e) {
-            wrapException(e);
+        if (tmpFile2) {
+          SVNFileUtil.deleteFile(file2);
         }
+      } catch (SVNException e) {
+        // skip
+      }
     }
+  }
 
-    private void displayCannotDisplayFileMarkedBinary(OutputStream outputStream) throws SVNException {
-        try {
-            displayString(outputStream, "Cannot display: file marked as a binary type.");
-            displayEOL(outputStream);
-        } catch (IOException e) {
-            wrapException(e);
-        }
+  private String getExternalDiffCommand() {
+    return externalDiffCommand;
+  }
+
+  private void displayMimeType(OutputStream outputStream, String mimeType) throws SVNException {
+    try {
+      displayString(outputStream, SVNProperty.MIME_TYPE);
+      displayString(outputStream, " = ");
+      displayString(outputStream, mimeType);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
     }
+  }
 
-    private void ensureEncodingAndEOLSet() {
-        if (getEOL() == null) {
-            setEOL(SVNProperty.EOL_LF_BYTES);
-        }
-        if (getEncoding() == null) {
-            final ISVNOptions options = getOptions();
-            if (options != null && options.getNativeCharset() != null) {
-                setEncoding(options.getNativeCharset());
-            } else {
-                setEncoding("UTF-8");
-            }
-        }
+  private void displayMimeTypes(OutputStream outputStream, String mimeType1, String mimeType2) throws SVNException {
+    try {
+      displayString(outputStream, SVNProperty.MIME_TYPE);
+      displayString(outputStream, " = (");
+      displayString(outputStream, mimeType1);
+      displayString(outputStream, ", ");
+      displayString(outputStream, mimeType2);
+      displayString(outputStream, ")");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
     }
+  }
 
-    private void displayPropDiffValues(OutputStream outputStream, SVNProperties diff, SVNProperties baseProps) throws SVNException {
-        for (Iterator changedPropNames = diff.nameSet().iterator(); changedPropNames.hasNext();) {
-            String name = (String) changedPropNames.next();
-            SVNPropertyValue originalValue = baseProps != null ? baseProps.getSVNPropertyValue(name) : null;
-            SVNPropertyValue newValue = diff.getSVNPropertyValue(name);
-            String headerFormat = null;
+  private void displayCannotDisplayFileMarkedBinary(OutputStream outputStream) throws SVNException {
+    try {
+      displayString(outputStream, "Cannot display: file marked as a binary type.");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
 
-            if (originalValue == null) {
-                headerFormat = "Added: ";
-            } else if (newValue == null) {
-                headerFormat = "Deleted: ";
-            } else {
-                headerFormat = "Modified: ";
-            }
+  private void ensureEncodingAndEOLSet() {
+    if (getEOL() == null) {
+      setEOL(SVNProperty.EOL_LF_BYTES);
+    }
+    if (getEncoding() == null) {
+      final ISVNOptions options = getOptions();
+      if (options != null && options.getNativeCharset() != null) {
+        setEncoding(options.getNativeCharset());
+      } else {
+        setEncoding("UTF-8");
+      }
+    }
+  }
 
-            try {
-                displayString(outputStream, (headerFormat + name));
-                displayEOL(outputStream);
-                if (SVNProperty.MERGE_INFO.equals(name)) {
-                    displayMergeInfoDiff(outputStream, originalValue == null ? null : originalValue.getString(), newValue == null ? null : newValue.getString());
-                    continue;
-                }
+  private void displayPropDiffValues(OutputStream outputStream, SVNProperties diff, SVNProperties baseProps) throws SVNException {
+    for (Iterator changedPropNames = diff.nameSet().iterator(); changedPropNames.hasNext(); ) {
+      String name = (String) changedPropNames.next();
+      SVNPropertyValue originalValue = baseProps != null ? baseProps.getSVNPropertyValue(name) : null;
+      SVNPropertyValue newValue = diff.getSVNPropertyValue(name);
+      String headerFormat = null;
 
-                byte[] originalValueBytes = getPropertyAsBytes(originalValue, getEncoding());
-                byte[] newValueBytes = getPropertyAsBytes(newValue, getEncoding());
+      if (originalValue == null) {
+        headerFormat = "Added: ";
+      } else if (newValue == null) {
+        headerFormat = "Deleted: ";
+      } else {
+        headerFormat = "Modified: ";
+      }
 
-                if (originalValueBytes == null) {
-                    originalValueBytes = new byte[0];
-                } else {
-                    originalValueBytes = maybeAppendEOL(originalValueBytes);
-                }
-
-                boolean newValueHadEol = newValueBytes != null && newValueBytes.length > 0 &&
-                        (newValueBytes[newValueBytes.length - 1] == SVNProperty.EOL_CR_BYTES[0] ||
-                        newValueBytes[newValueBytes.length - 1] == SVNProperty.EOL_LF_BYTES[0]);
-
-                if (newValueBytes == null) {
-                    newValueBytes = new byte[0];
-                } else {
-                    newValueBytes = maybeAppendEOL(newValueBytes);
-                }
-
-                QDiffUniGenerator.setup();
-                Map properties = new SVNHashMap();
-
-                properties.put(QDiffGeneratorFactory.IGNORE_EOL_PROPERTY, Boolean.valueOf(getDiffOptions().isIgnoreEOLStyle()));
-                properties.put(QDiffGeneratorFactory.EOL_PROPERTY, new String(getEOL()));
-                properties.put(QDiffGeneratorFactory.HUNK_DELIMITER, "##");
-                if (getDiffOptions().isIgnoreAllWhitespace()) {
-                    properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_ALL_SPACE);
-                } else if (getDiffOptions().isIgnoreAmountOfWhitespace()) {
-                    properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_SPACE_CHANGE);
-                }
-
-                QDiffGenerator generator = new QDiffUniGenerator(properties, "");
-                Writer writer = new OutputStreamWriter(outputStream, getEncoding());
-                QDiffManager.generateTextDiff(new ByteArrayInputStream(originalValueBytes), new ByteArrayInputStream(newValueBytes),
-                        null, writer, generator);
-                writer.flush();
-                if (!newValueHadEol) {
-                    displayString(outputStream, "\\ No newline at end of property");
-                    displayEOL(outputStream);
-                }
-            } catch (IOException e) {
-                wrapException(e);
-            }
+      try {
+        displayString(outputStream, (headerFormat + name));
+        displayEOL(outputStream);
+        if (SVNProperty.MERGE_INFO.equals(name)) {
+          displayMergeInfoDiff(outputStream, originalValue == null ? null : originalValue.getString(), newValue == null ? null : newValue.getString());
+          continue;
         }
 
-    }
+        byte[] originalValueBytes = getPropertyAsBytes(originalValue, getEncoding());
+        byte[] newValueBytes = getPropertyAsBytes(newValue, getEncoding());
 
-    private byte[] maybeAppendEOL(byte[] buffer) {
-        if (buffer.length == 0) {
-            return buffer;
-        }
-
-        byte lastByte = buffer[buffer.length - 1];
-        if (lastByte == SVNProperty.EOL_CR_BYTES[0]) {
-            return buffer;
-        } else if (lastByte != SVNProperty.EOL_LF_BYTES[0]) {
-            final byte[] newBuffer = new byte[buffer.length + getEOL().length];
-            System.arraycopy(buffer, 0, newBuffer, 0, buffer.length);
-            System.arraycopy(getEOL(), 0, newBuffer, buffer.length, getEOL().length);
-            return newBuffer;
+        if (originalValueBytes == null) {
+          originalValueBytes = new byte[0];
         } else {
-            return buffer;
+          originalValueBytes = maybeAppendEOL(originalValueBytes);
         }
-    }
 
-    private String getGitDiffLabel1(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision) {
-        if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
-            return getLabel("a/" + path1, revision);
-        } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
-            return getLabel("a/" + copyFromPath, revision);
-        } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
-            return getLabel("/dev/null", revision);
-        } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
-            return getLabel("a/" + path1, revision);
-        } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
-            return getLabel("a/" + copyFromPath, revision);
+        boolean newValueHadEol = newValueBytes != null && newValueBytes.length > 0 &&
+          (newValueBytes[newValueBytes.length - 1] == SVNProperty.EOL_CR_BYTES[0] ||
+            newValueBytes[newValueBytes.length - 1] == SVNProperty.EOL_LF_BYTES[0]);
+
+        if (newValueBytes == null) {
+          newValueBytes = new byte[0];
+        } else {
+          newValueBytes = maybeAppendEOL(newValueBytes);
         }
-        throw new IllegalArgumentException("Unsupported operation: " + operationKind);
-    }
 
-    private String getGitDiffLabel2(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision) {
-        if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
-            return getLabel("/dev/null", revision);
-        } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
-            return getLabel("b/" + path2, revision);
-        } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
-            return getLabel("b/" + path2, revision);
-        } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
-            return getLabel("b/" + path2, revision);
-        } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
-            return getLabel("b/" + path2, revision);
+        QDiffUniGenerator.setup();
+        Map properties = new SVNHashMap();
+
+        properties.put(QDiffGeneratorFactory.IGNORE_EOL_PROPERTY, Boolean.valueOf(getDiffOptions().isIgnoreEOLStyle()));
+        properties.put(QDiffGeneratorFactory.EOL_PROPERTY, new String(getEOL()));
+        properties.put(QDiffGeneratorFactory.HUNK_DELIMITER, "##");
+        if (getDiffOptions().isIgnoreAllWhitespace()) {
+          properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_ALL_SPACE);
+        } else if (getDiffOptions().isIgnoreAmountOfWhitespace()) {
+          properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_SPACE_CHANGE);
         }
-        throw new IllegalArgumentException("Unsupported operation: " + operationKind);
-    }
 
-    private void displayGitDiffHeader(OutputStream outputStream, SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath) throws SVNException {
-        if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
-            displayGitDiffHeaderDeleted(outputStream, path1, path2, copyFromPath);
-        } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
-            displayGitDiffHeaderCopied(outputStream, path1, path2, copyFromPath);
-        } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
-            displayGitDiffHeaderAdded(outputStream, path1, path2, copyFromPath);
-        } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
-            displayGitDiffHeaderModified(outputStream, path1, path2, copyFromPath);
-        } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
-            displayGitDiffHeaderRenamed(outputStream, path1, path2, copyFromPath);
+        QDiffGenerator generator = new QDiffUniGenerator(properties, "");
+        Writer writer = new OutputStreamWriter(outputStream, getEncoding());
+        QDiffManager.generateTextDiff(new ByteArrayInputStream(originalValueBytes), new ByteArrayInputStream(newValueBytes),
+          null, writer, generator);
+        writer.flush();
+        if (!newValueHadEol) {
+          displayString(outputStream, "\\ No newline at end of property");
+          displayEOL(outputStream);
         }
+      } catch (IOException e) {
+        wrapException(e);
+      }
     }
 
-    private void displayGitDiffHeaderAdded(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
-        try {
-            displayString(outputStream, "diff --git ");
-            displayFirstGitPath(outputStream, path1);
-            displayString(outputStream, " ");
-            displaySecondGitPath(outputStream, path2);
-            displayEOL(outputStream);
-            displayString(outputStream, "new file mode 10644");
-            displayEOL(outputStream);
-        } catch (IOException e) {
-            wrapException(e);
-        }
+  }
+
+  private byte[] maybeAppendEOL(byte[] buffer) {
+    if (buffer.length == 0) {
+      return buffer;
     }
 
-    private void displayGitDiffHeaderDeleted(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
-        try {
-            displayString(outputStream, "diff --git ");
-            displayFirstGitPath(outputStream, path1);
-            displayString(outputStream, " ");
-            displaySecondGitPath(outputStream, path2);
-            displayEOL(outputStream);
-            displayString(outputStream, "deleted file mode 10644");
-            displayEOL(outputStream);
-        } catch (IOException e) {
-            wrapException(e);
-        }
+    byte lastByte = buffer[buffer.length - 1];
+    if (lastByte == SVNProperty.EOL_CR_BYTES[0]) {
+      return buffer;
+    } else if (lastByte != SVNProperty.EOL_LF_BYTES[0]) {
+      final byte[] newBuffer = new byte[buffer.length + getEOL().length];
+      System.arraycopy(buffer, 0, newBuffer, 0, buffer.length);
+      System.arraycopy(getEOL(), 0, newBuffer, buffer.length, getEOL().length);
+      return newBuffer;
+    } else {
+      return buffer;
     }
+  }
 
-    private void displayGitDiffHeaderCopied(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
-        try {
-            displayString(outputStream, "diff --git ");
-            displayFirstGitPath(outputStream, copyFromPath);
-            displayString(outputStream, " ");
-            displaySecondGitPath(outputStream, path2);
-            displayEOL(outputStream);
-            displayString(outputStream, "copy from ");
-            displayString(outputStream, copyFromPath);
-            displayEOL(outputStream);
-            displayString(outputStream, "copy to ");
-            displayString(outputStream, path2);
-            displayEOL(outputStream);
-        } catch (IOException e) {
-            wrapException(e);
-        }
+  private String getGitDiffLabel1(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision) {
+    if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+      return getLabel("a/" + path1, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+      return getLabel("a/" + copyFromPath, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+      return getLabel("/dev/null", revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+      return getLabel("a/" + path1, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+      return getLabel("a/" + copyFromPath, revision);
     }
+    throw new IllegalArgumentException("Unsupported operation: " + operationKind);
+  }
 
-    private void displayGitDiffHeaderRenamed(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
-        try {
-            displayString(outputStream, "diff --git ");
-            displayFirstGitPath(outputStream, copyFromPath);
-            displayString(outputStream, " ");
-            displaySecondGitPath(outputStream, path2);
-            displayEOL(outputStream);
-            displayString(outputStream, "rename from ");
-            displayString(outputStream, copyFromPath);
-            displayEOL(outputStream);
-            displayString(outputStream, "rename to ");
-            displayString(outputStream, path2);
-            displayEOL(outputStream);
-        } catch (IOException e) {
-            wrapException(e);
-        }
+  private String getGitDiffLabel2(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision) {
+    if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+      return getLabel("/dev/null", revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+      return getLabel("b/" + path2, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+      return getLabel("b/" + path2, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+      return getLabel("b/" + path2, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+      return getLabel("b/" + path2, revision);
     }
+    throw new IllegalArgumentException("Unsupported operation: " + operationKind);
+  }
 
-    private void displayGitDiffHeaderModified(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
-        try {
-            displayString(outputStream, "diff --git ");
-            displayFirstGitPath(outputStream, path1);
-            displayString(outputStream, " ");
-            displaySecondGitPath(outputStream, path2);
-            displayEOL(outputStream);
-        } catch (IOException e) {
-            wrapException(e);
-        }
+  private void displayGitDiffHeader(OutputStream outputStream, SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath) throws SVNException {
+    if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+      displayGitDiffHeaderDeleted(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+      displayGitDiffHeaderCopied(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+      displayGitDiffHeaderAdded(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+      displayGitDiffHeaderModified(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+      displayGitDiffHeaderRenamed(outputStream, path1, path2, copyFromPath);
     }
+  }
 
-    private void displayFirstGitPath(OutputStream outputStream, String path1) throws IOException {
-        displayGitPath(outputStream, path1, "a/", false);
+  private void displayGitDiffHeaderAdded(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, path1);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "new file mode 10644");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
     }
+  }
 
-    private void displaySecondGitPath(OutputStream outputStream, String path2) throws IOException {
-        displayGitPath(outputStream, path2, "b/", false);
+  private void displayGitDiffHeaderDeleted(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, path1);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "deleted file mode 10644");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
     }
+  }
 
-    private void displayFirstGitLabelPath(OutputStream outputStream, String path1, String revision1, SvnDiffCallback.OperationKind operation) throws IOException {
-        String pathPrefix = "a/";
-        if (operation == SvnDiffCallback.OperationKind.Added) {
-            path1 = "/dev/null";
-            pathPrefix = "";
-        }
-        displayGitPath(outputStream, getLabel(path1, revision1), pathPrefix, true);
+  private void displayGitDiffHeaderCopied(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, copyFromPath);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "copy from ");
+      displayString(outputStream, copyFromPath);
+      displayEOL(outputStream);
+      displayString(outputStream, "copy to ");
+      displayString(outputStream, path2);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
     }
+  }
 
-    private void displaySecondGitLabelPath(OutputStream outputStream, String path2, String revision2, SvnDiffCallback.OperationKind operation) throws IOException {
-        String pathPrefix = "b/";
-        if (operation == SvnDiffCallback.OperationKind.Deleted) {
-            path2 = "/dev/null";
-            pathPrefix = "";
-        }
-        displayGitPath(outputStream, getLabel(path2, revision2), pathPrefix, true);
+  private void displayGitDiffHeaderRenamed(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, copyFromPath);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "rename from ");
+      displayString(outputStream, copyFromPath);
+      displayEOL(outputStream);
+      displayString(outputStream, "rename to ");
+      displayString(outputStream, path2);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
     }
+  }
 
-    private void displayGitPath(OutputStream outputStream, String path1, String pathPrefix, boolean label) throws IOException {
+  private void displayGitDiffHeaderModified(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, path1);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayFirstGitPath(OutputStream outputStream, String path1) throws IOException {
+    displayGitPath(outputStream, path1, "a/", false);
+  }
+
+  private void displaySecondGitPath(OutputStream outputStream, String path2) throws IOException {
+    displayGitPath(outputStream, path2, "b/", false);
+  }
+
+  private void displayFirstGitLabelPath(OutputStream outputStream, String path1, String revision1, SvnDiffCallback.OperationKind operation) throws IOException {
+    String pathPrefix = "a/";
+    if (operation == SvnDiffCallback.OperationKind.Added) {
+      path1 = "/dev/null";
+      pathPrefix = "";
+    }
+    displayGitPath(outputStream, getLabel(path1, revision1), pathPrefix, true);
+  }
+
+  private void displaySecondGitLabelPath(OutputStream outputStream, String path2, String revision2, SvnDiffCallback.OperationKind operation) throws IOException {
+    String pathPrefix = "b/";
+    if (operation == SvnDiffCallback.OperationKind.Deleted) {
+      path2 = "/dev/null";
+      pathPrefix = "";
+    }
+    displayGitPath(outputStream, getLabel(path2, revision2), pathPrefix, true);
+  }
+
+  private void displayGitPath(OutputStream outputStream, String path1, String pathPrefix, boolean label) throws IOException {
 //        if (!label && path1.length() == 0) {
 //            displayString(outputStream, ".");
 //        } else {
-            displayString(outputStream, pathPrefix);
-            displayString(outputStream, path1);
+    displayString(outputStream, pathPrefix);
+    displayString(outputStream, path1);
 //        }
+  }
+
+  private String getAdjustedPathWithLabel(String displayPath, String path, String revision, String commonAncestor) {
+    String adjustedPath = getAdjustedPath(displayPath, path, commonAncestor);
+    return getLabel(adjustedPath, revision);
+  }
+
+  private String getAdjustedPath(String displayPath, String path1, String commonAncestor) {
+    String adjustedPath = getRelativePath(path1, commonAncestor);
+
+    if (adjustedPath == null || adjustedPath.length() == 0) {
+      adjustedPath = displayPath;
+    } else if (adjustedPath.charAt(0) == '/') {
+      adjustedPath = displayPath + "\t(..." + adjustedPath + ")";
+    } else {
+      adjustedPath = displayPath + "\t(.../" + adjustedPath + ")";
     }
+    return adjustedPath;
+    //TODO: respect relativeToDir
+  }
 
-    private String getAdjustedPathWithLabel(String displayPath, String path, String revision, String commonAncestor) {
-        String adjustedPath = getAdjustedPath(displayPath, path, commonAncestor);
-        return getLabel(adjustedPath, revision);
-    }
+  protected String getLabel(String path, String revToken) {
+    revToken = revToken == null ? WC_REVISION_LABEL : revToken;
+    return path + "\t" + revToken;
+  }
 
-    private String getAdjustedPath(String displayPath, String path1, String commonAncestor) {
-        String adjustedPath = getRelativePath(path1, commonAncestor);
-
-        if (adjustedPath == null || adjustedPath.length() == 0) {
-            adjustedPath = displayPath;
-        } else if (adjustedPath.charAt(0) == '/') {
-            adjustedPath = displayPath + "\t(..." + adjustedPath + ")";
-        } else {
-            adjustedPath = displayPath + "\t(.../" + adjustedPath + ")";
-        }
-        return adjustedPath;
-        //TODO: respect relativeToDir
-    }
-
-    protected String getLabel(String path, String revToken) {
-        revToken = revToken == null ? WC_REVISION_LABEL : revToken;
-        return path + "\t" + revToken;
-    }
-
-    protected boolean displayHeader(OutputStream os, String path, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation) throws SVNException {
-        try {
-            if (deleted && !isDiffDeleted()) {
-                displayString(os, "Index: ");
-                displayString(os, path);
-                displayString(os, " (deleted)");
-                displayEOL(os);
-                displayString(os, HEADER_SEPARATOR);
-                displayEOL(os);
-                return true;
-            }
-            if (added && !isDiffAdded()) {
-                displayString(os, "Index: ");
-                displayString(os, path);
-                displayString(os, " (added)");
-                displayEOL(os);
-                displayString(os, HEADER_SEPARATOR);
-                displayEOL(os);
-                return true;
-            }
-            displayString(os, "Index: ");
-            displayString(os, path);
-            displayEOL(os);
-            displayString(os, HEADER_SEPARATOR);
-            displayEOL(os);
-            return false;
-        } catch (IOException e) {
-            wrapException(e);
-        }
-        return false;
-    }
-
-    protected void displayHeaderFields(OutputStream os, String label1, String label2) throws SVNException {
-        try {
-            displayString(os, "--- ");
-            displayString(os, label1);
-            displayEOL(os);
-            displayString(os, "+++ ");
-            displayString(os, label2);
-            displayEOL(os);
-        } catch (IOException e) {
-            wrapException(e);
-        }
-    }
-
-    private void displayPropertyChangesOn(String path, OutputStream outputStream) throws SVNException {
-        try {
-            displayEOL(outputStream);
-            displayString(outputStream, ("Property changes on: " + (useLocalFileSeparatorChar() ? path.replace('/', File.separatorChar) : path)));
-            displayEOL(outputStream);
-            displayString(outputStream, PROPERTIES_SEPARATOR);
-            displayEOL(outputStream);
-        } catch (IOException e) {
-            wrapException(e);
-        }
-    }
-
-    private byte[] getPropertyAsBytes(SVNPropertyValue value, String encoding){
-        if (value == null){
-            return null;
-        }
-        if (value.isString()){
-            try {
-                return value.getString().getBytes(encoding);
-            } catch (UnsupportedEncodingException e) {
-                return value.getString().getBytes();
-            }
-        }
-        return value.getBytes();
-    }
-
-    private void displayMergeInfoDiff(OutputStream outputStream, String oldValue, String newValue) throws SVNException, IOException {
-        Map oldMergeInfo = null;
-        Map newMergeInfo = null;
-        if (oldValue != null) {
-            oldMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(oldValue), null);
-        }
-        if (newValue != null) {
-            newMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(newValue), null);
-        }
-
-        Map deleted = new TreeMap();
-        Map added = new TreeMap();
-        SVNMergeInfoUtil.diffMergeInfo(deleted, added, oldMergeInfo, newMergeInfo, true);
-
-        for (Iterator paths = deleted.keySet().iterator(); paths.hasNext();) {
-            String path = (String) paths.next();
-            SVNMergeRangeList rangeList = (SVNMergeRangeList) deleted.get(path);
-            displayString(outputStream, ("   Reverse-merged " + path + ":r"));
-            displayString(outputStream, rangeList.toString());
-            displayEOL(outputStream);
-        }
-
-        for (Iterator paths = added.keySet().iterator(); paths.hasNext();) {
-            String path = (String) paths.next();
-            SVNMergeRangeList rangeList = (SVNMergeRangeList) added.get(path);
-            displayString(outputStream, ("   Merged " + path + ":r"));
-            displayString(outputStream, rangeList.toString());
-            displayEOL(outputStream);
-        }
-    }
-
-    private boolean useLocalFileSeparatorChar() {
+  protected boolean displayHeader(OutputStream os, String path, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation) throws SVNException {
+    try {
+      if (deleted && !isDiffDeleted()) {
+        displayString(os, "Index: ");
+        displayString(os, path);
+        displayString(os, " (deleted)");
+        displayEOL(os);
+        displayString(os, HEADER_SEPARATOR);
+        displayEOL(os);
         return true;
+      }
+      if (added && !isDiffAdded()) {
+        displayString(os, "Index: ");
+        displayString(os, path);
+        displayString(os, " (added)");
+        displayEOL(os);
+        displayString(os, HEADER_SEPARATOR);
+        displayEOL(os);
+        return true;
+      }
+      displayString(os, "Index: ");
+      displayString(os, path);
+      displayEOL(os);
+      displayString(os, HEADER_SEPARATOR);
+      displayEOL(os);
+      return false;
+    } catch (IOException e) {
+      wrapException(e);
+    }
+    return false;
+  }
+
+  protected void displayHeaderFields(OutputStream os, String label1, String label2) throws SVNException {
+    try {
+      displayString(os, "--- ");
+      displayString(os, label1);
+      displayEOL(os);
+      displayString(os, "+++ ");
+      displayString(os, label2);
+      displayEOL(os);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayPropertyChangesOn(String path, OutputStream outputStream) throws SVNException {
+    try {
+      displayEOL(outputStream);
+      displayString(outputStream, ("Property changes on: " + (useLocalFileSeparatorChar() ? path.replace('/', File.separatorChar) : path)));
+      displayEOL(outputStream);
+      displayString(outputStream, PROPERTIES_SEPARATOR);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private byte[] getPropertyAsBytes(SVNPropertyValue value, String encoding) {
+    if (value == null) {
+      return null;
+    }
+    if (value.isString()) {
+      try {
+        return value.getString().getBytes(encoding);
+      } catch (UnsupportedEncodingException e) {
+        return value.getString().getBytes();
+      }
+    }
+    return value.getBytes();
+  }
+
+  private void displayMergeInfoDiff(OutputStream outputStream, String oldValue, String newValue) throws SVNException, IOException {
+    Map oldMergeInfo = null;
+    Map newMergeInfo = null;
+    if (oldValue != null) {
+      oldMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(oldValue), null);
+    }
+    if (newValue != null) {
+      newMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(newValue), null);
     }
 
-    public boolean isDiffDeleted() {
-        return diffDeleted;
+    Map deleted = new TreeMap();
+    Map added = new TreeMap();
+    SVNMergeInfoUtil.diffMergeInfo(deleted, added, oldMergeInfo, newMergeInfo, true);
+
+    for (Iterator paths = deleted.keySet().iterator(); paths.hasNext(); ) {
+      String path = (String) paths.next();
+      SVNMergeRangeList rangeList = (SVNMergeRangeList) deleted.get(path);
+      displayString(outputStream, ("   Reverse-merged " + path + ":r"));
+      displayString(outputStream, rangeList.toString());
+      displayEOL(outputStream);
     }
 
-    public boolean isDiffAdded() {
-        return diffAdded;
+    for (Iterator paths = added.keySet().iterator(); paths.hasNext(); ) {
+      String path = (String) paths.next();
+      SVNMergeRangeList rangeList = (SVNMergeRangeList) added.get(path);
+      displayString(outputStream, ("   Merged " + path + ":r"));
+      displayString(outputStream, rangeList.toString());
+      displayEOL(outputStream);
+    }
+  }
+
+  private boolean useLocalFileSeparatorChar() {
+    return true;
+  }
+
+  public boolean isDiffDeleted() {
+    return diffDeleted;
+  }
+
+  public boolean isDiffAdded() {
+    return diffAdded;
+  }
+
+  private void wrapException(IOException e) throws SVNException {
+    SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, e);
+    SVNErrorManager.error(errorMessage, e, SVNLogType.WC);
+  }
+
+  private void displayString(OutputStream outputStream, String s) throws IOException {
+    outputStream.write(s.getBytes(HEADER_ENCODING));
+  }
+
+  private void displayEOL(OutputStream os) throws IOException {
+    os.write(getEOL());
+  }
+
+  public SVNDiffOptions getDiffOptions() {
+    if (diffOptions == null) {
+      diffOptions = new SVNDiffOptions();
+    }
+    return diffOptions;
+  }
+
+  public void setExternalDiffCommand(String externalDiffCommand) {
+    this.externalDiffCommand = externalDiffCommand;
+  }
+
+  public void setRawDiffOptions(List<String> rawDiffOptions) {
+    this.rawDiffOptions = rawDiffOptions;
+  }
+
+  public void setDiffOptions(SVNDiffOptions diffOptions) {
+    this.diffOptions = diffOptions;
+  }
+
+  public void setDiffDeleted(boolean diffDeleted) {
+    this.diffDeleted = diffDeleted;
+  }
+
+  public void setDiffAdded(boolean diffAdded) {
+    this.diffAdded = diffAdded;
+  }
+
+  public void setBasePath(File absoluteFile) {
+    setBaseTarget(SvnTarget.fromFile(absoluteFile));
+  }
+
+  public void setFallbackToAbsolutePath(boolean fallbackToAbsolutePath) {
+    this.fallbackToAbsolutePath = fallbackToAbsolutePath;
+  }
+
+  public void setOptions(ISVNOptions options) {
+    this.options = options;
+  }
+
+  public ISVNOptions getOptions() {
+    return options;
+  }
+
+  private class EmptyDetectionOutputStream extends OutputStream {
+
+    private final OutputStream outputStream;
+    private boolean somethingWritten;
+
+    public EmptyDetectionOutputStream(OutputStream outputStream) {
+      this.outputStream = outputStream;
+      this.somethingWritten = false;
     }
 
-    private void wrapException(IOException e) throws SVNException {
-        SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, e);
-        SVNErrorManager.error(errorMessage, e, SVNLogType.WC);
+    public boolean isSomethingWritten() {
+      return somethingWritten;
     }
 
-    private void displayString(OutputStream outputStream, String s) throws IOException {
-        outputStream.write(s.getBytes(HEADER_ENCODING));
+    @Override
+    public void write(int c) throws IOException {
+      somethingWritten = true;
+      outputStream.write(c);
     }
 
-    private void displayEOL(OutputStream os) throws IOException {
-        os.write(getEOL());
+    @Override
+    public void write(byte[] bytes) throws IOException {
+      somethingWritten = bytes.length > 0;
+      outputStream.write(bytes);
     }
 
-    public SVNDiffOptions getDiffOptions() {
-        if (diffOptions == null) {
-            diffOptions = new SVNDiffOptions();
-        }
-        return diffOptions;
+    @Override
+    public void write(byte[] bytes, int offset, int length) throws IOException {
+      somethingWritten = length > 0;
+      outputStream.write(bytes, offset, length);
     }
 
-    public void setExternalDiffCommand(String externalDiffCommand) {
-        this.externalDiffCommand = externalDiffCommand;
+    @Override
+    public void flush() throws IOException {
+      outputStream.flush();
     }
 
-    public void setRawDiffOptions(List<String> rawDiffOptions) {
-        this.rawDiffOptions = rawDiffOptions;
-    }
-
-    public void setDiffOptions(SVNDiffOptions diffOptions) {
-        this.diffOptions = diffOptions;
-    }
-
-    public void setDiffDeleted(boolean diffDeleted) {
-        this.diffDeleted = diffDeleted;
-    }
-
-    public void setDiffAdded(boolean diffAdded) {
-        this.diffAdded = diffAdded;
-    }
-
-    public void setBasePath(File absoluteFile) {
-        setBaseTarget(SvnTarget.fromFile(absoluteFile));
-    }
-
-    public void setFallbackToAbsolutePath(boolean fallbackToAbsolutePath) {
-        this.fallbackToAbsolutePath = fallbackToAbsolutePath;
-    }
-
-    public void setOptions(ISVNOptions options) {
-        this.options = options;
-    }
-
-    public ISVNOptions getOptions() {
-        return options;
-    }
-
-    private class EmptyDetectionOutputStream extends OutputStream {
-
-        private final OutputStream outputStream;
-        private boolean somethingWritten;
-
-        public EmptyDetectionOutputStream(OutputStream outputStream) {
-            this.outputStream = outputStream;
-            this.somethingWritten = false;
-        }
-
-        public boolean isSomethingWritten() {
-            return somethingWritten;
-        }
-
-        @Override
-        public void write(int c) throws IOException {
-            somethingWritten = true;
-            outputStream.write(c);
-        }
-
-        @Override
-        public void write(byte[] bytes) throws IOException {
-            somethingWritten = bytes.length > 0;
-            outputStream.write(bytes);
-        }
-
-        @Override
-        public void write(byte[] bytes, int offset, int length) throws IOException {
-            somethingWritten = length > 0;
-            outputStream.write(bytes, offset, length);
-        }
-
-        @Override
-        public void flush() throws IOException {
-            outputStream.flush();
-        }
-
-        @Override
-        public void close() throws IOException {
-            outputStream.close();
-        }
+    @Override
+    public void close() throws IOException {
+      outputStream.close();
     }
+  }
 }

From a36768fbb3f94d838e6a5c56bc2f228a70399bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 25 Oct 2018 10:47:44 +0200
Subject: [PATCH 015/188] Fix typo

---
 .../src/main/java/sonia/scm/filter/MDCFilter.java   | 13 ++++++-------
 .../test/java/sonia/scm/filter/MDCFilterTest.java   |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java
index 9198c19ef7..ffc976198c 100644
--- a/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java
@@ -34,7 +34,6 @@ package sonia.scm.filter;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Singleton;
 
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
@@ -65,11 +64,11 @@ public class MDCFilter extends HttpFilter
 
   /** Field description */
   @VisibleForTesting
-  static final String MDC_CLIEN_HOST = "client_host";
+  static final String MDC_CLIENT_HOST = "client_host";
 
   /** Field description */
   @VisibleForTesting
-  static final String MDC_CLIEN_IP = "client_ip";
+  static final String MDC_CLIENT_IP = "client_ip";
   
   /** url of the current request */
   @VisibleForTesting
@@ -102,8 +101,8 @@ public class MDCFilter extends HttpFilter
     throws IOException, ServletException
   {
     MDC.put(MDC_USERNAME, getUsername());
-    MDC.put(MDC_CLIEN_IP, request.getRemoteAddr());
-    MDC.put(MDC_CLIEN_HOST, request.getRemoteHost());
+    MDC.put(MDC_CLIENT_IP, request.getRemoteAddr());
+    MDC.put(MDC_CLIENT_HOST, request.getRemoteHost());
     MDC.put(MDC_REQUEST_METHOD, request.getMethod());
     MDC.put(MDC_REQUEST_URI, request.getRequestURI());
 
@@ -114,8 +113,8 @@ public class MDCFilter extends HttpFilter
     finally
     {
       MDC.remove(MDC_USERNAME);
-      MDC.remove(MDC_CLIEN_IP);
-      MDC.remove(MDC_CLIEN_HOST);
+      MDC.remove(MDC_CLIENT_IP);
+      MDC.remove(MDC_CLIENT_HOST);
       MDC.remove(MDC_REQUEST_METHOD);
       MDC.remove(MDC_REQUEST_URI);
     }
diff --git a/scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java b/scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java
index ac1b7335fc..56e1a74572 100644
--- a/scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java
@@ -98,8 +98,8 @@ public class MDCFilterTest extends AbstractTestBase {
     assertNotNull(chain.ctx);
     assertEquals("trillian", chain.ctx.get(MDCFilter.MDC_USERNAME));
     assertEquals("api/v1/repositories", chain.ctx.get(MDCFilter.MDC_REQUEST_URI));
-    assertEquals("127.0.0.1", chain.ctx.get(MDCFilter.MDC_CLIEN_IP));
-    assertEquals("localhost", chain.ctx.get(MDCFilter.MDC_CLIEN_HOST));
+    assertEquals("127.0.0.1", chain.ctx.get(MDCFilter.MDC_CLIENT_IP));
+    assertEquals("localhost", chain.ctx.get(MDCFilter.MDC_CLIENT_HOST));
     assertEquals("GET", chain.ctx.get(MDCFilter.MDC_REQUEST_METHOD));
   }
   

From 20df283b089bea75ddd1c2866c97b3556d901e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 25 Oct 2018 11:27:31 +0200
Subject: [PATCH 016/188] show Content if currect file is no directory

---
 .../src/repos/content/components/Content.js   |  4 +-
 .../repos/content/components/Content.test.js  | 10 ++-
 .../src/repos/sources/components/FileTree.js  | 28 +-------
 .../repos/sources/components/FileTreeLeaf.js  |  8 ++-
 .../src/repos/sources/containers/Sources.js   | 65 ++++++++++++++-----
 scm-ui/src/repos/sources/modules/sources.js   | 14 ++++
 .../src/repos/sources/modules/sources.test.js | 65 ++++++++++++++++++-
 7 files changed, 141 insertions(+), 53 deletions(-)

diff --git a/scm-ui/src/repos/content/components/Content.js b/scm-ui/src/repos/content/components/Content.js
index e99692974f..edf46454ae 100644
--- a/scm-ui/src/repos/content/components/Content.js
+++ b/scm-ui/src/repos/content/components/Content.js
@@ -23,14 +23,14 @@ class Content extends React.Component<Props, State> {
   componentDidMount() {}
 
   render() {
-    return null;
+    return "Hallo here is content";
   }
 }
 
 export function getContentType(url: string) {
   return apiClient
     .head(url)
-    .then(response => response)
+    .then(response => response.headers.get("Content-Type"))
     .catch(err => {
       return null;
     });
diff --git a/scm-ui/src/repos/content/components/Content.test.js b/scm-ui/src/repos/content/components/Content.test.js
index a1828b0872..ef115accd4 100644
--- a/scm-ui/src/repos/content/components/Content.test.js
+++ b/scm-ui/src/repos/content/components/Content.test.js
@@ -10,13 +10,17 @@ describe("get content type", () => {
     fetchMock.restore();
   });
 
-  xit("should return content", done => {
+  it("should return content", done => {
+    let headers = {
+      "Content-Type": "application/text"
+    };
+
     fetchMock.head("/api/v2" + CONTENT_URL, {
-      "Content-Type": "text/plain"
+      headers
     });
 
     getContentType(CONTENT_URL).then(content => {
-      expect(content).toBe("This is a testContent");
+      expect(content).toBe("application/text");
       done();
     });
   });
diff --git a/scm-ui/src/repos/sources/components/FileTree.js b/scm-ui/src/repos/sources/components/FileTree.js
index 02aa22f942..e9b5c70d3d 100644
--- a/scm-ui/src/repos/sources/components/FileTree.js
+++ b/scm-ui/src/repos/sources/components/FileTree.js
@@ -7,7 +7,6 @@ import FileTreeLeaf from "./FileTreeLeaf";
 import type { Repository, File } from "@scm-manager/ui-types";
 import { ErrorNotification, Loading } from "@scm-manager/ui-components";
 import {
-  fetchSources,
   getFetchSourcesFailure,
   isFetchSourcesPending,
   getSources
@@ -29,7 +28,6 @@ type Props = {
   revision: string,
   path: string,
   baseUrl: string,
-  fetchSources: (Repository, string, string) => void,
   // context props
   classes: any,
   t: string => string,
@@ -49,19 +47,6 @@ export function findParent(path: string) {
 }
 
 class FileTree extends React.Component<Props> {
-  componentDidMount() {
-    const { fetchSources, repository, revision, path } = this.props;
-
-    fetchSources(repository, revision, path);
-  }
-
-  componentDidUpdate(prevProps) {
-    const { fetchSources, repository, revision, path } = this.props;
-    if (prevProps.revision !== revision || prevProps.path !== path) {
-      fetchSources(repository, revision, path);
-    }
-  }
-
   render() {
     const {
       error,
@@ -167,18 +152,7 @@ const mapStateToProps = (state: any, ownProps: Props) => {
   };
 };
 
-const mapDispatchToProps = dispatch => {
-  return {
-    fetchSources: (repository: Repository, revision: string, path: string) => {
-      dispatch(fetchSources(repository, revision, path));
-    }
-  };
-};
-
 export default compose(
   withRouter,
-  connect(
-    mapStateToProps,
-    mapDispatchToProps
-  )
+  connect(mapStateToProps)
 )(injectSheet(styles)(translate("repos")(FileTree)));
diff --git a/scm-ui/src/repos/sources/components/FileTreeLeaf.js b/scm-ui/src/repos/sources/components/FileTreeLeaf.js
index 033d3b9b8a..b4e2ad59ea 100644
--- a/scm-ui/src/repos/sources/components/FileTreeLeaf.js
+++ b/scm-ui/src/repos/sources/components/FileTreeLeaf.js
@@ -49,14 +49,18 @@ class FileTreeLeaf extends React.Component<Props> {
         </Link>
       );
     }
-    return <FileIcon file={file} />;
+    return (
+      <Link to={this.createLink(file)}>
+        <FileIcon file={file} />
+      </Link>
+    );
   };
 
   createFileName = (file: File) => {
     if (file.directory) {
       return <Link to={this.createLink(file)}>{file.name}</Link>;
     }
-    return file.name;
+    return <Link to={this.createLink(file)}>{file.name}</Link>;
   };
 
   render() {
diff --git a/scm-ui/src/repos/sources/containers/Sources.js b/scm-ui/src/repos/sources/containers/Sources.js
index cf072e958e..a31a15353f 100644
--- a/scm-ui/src/repos/sources/containers/Sources.js
+++ b/scm-ui/src/repos/sources/containers/Sources.js
@@ -13,6 +13,8 @@ import {
   isFetchBranchesPending
 } from "../../modules/branches";
 import { compose } from "redux";
+import Content from "../../content/components/Content";
+import { fetchSources, isDirectory } from "../modules/sources";
 
 type Props = {
   repository: Repository,
@@ -22,9 +24,11 @@ type Props = {
   branches: Branch[],
   revision: string,
   path: string,
+  currentFileIsDirectory: boolean,
 
   // dispatch props
   fetchBranches: Repository => void,
+  fetchSources: (Repository, string, string) => void,
 
   // Context props
   history: any,
@@ -33,14 +37,26 @@ type Props = {
 
 class Sources extends React.Component<Props> {
   componentDidMount() {
-    const { fetchBranches, repository } = this.props;
+    const {
+      fetchBranches,
+      repository,
+      revision,
+      path,
+      fetchSources
+    } = this.props;
 
     fetchBranches(repository);
+    fetchSources(repository, revision, path);
+  }
+  componentDidUpdate(prevProps) {
+    const { fetchSources, repository, revision, path } = this.props;
+    if (prevProps.revision !== revision || prevProps.path !== path) {
+      fetchSources(repository, revision, path);
+    }
   }
 
   branchSelected = (branch?: Branch) => {
     const { baseUrl, history, path } = this.props;
-
     let url;
     if (branch) {
       if (path) {
@@ -55,7 +71,15 @@ class Sources extends React.Component<Props> {
   };
 
   render() {
-    const { repository, baseUrl, loading, error, revision, path } = this.props;
+    const {
+      repository,
+      baseUrl,
+      loading,
+      error,
+      revision,
+      path,
+      currentFileIsDirectory
+    } = this.props;
 
     if (error) {
       return <ErrorNotification error={error} />;
@@ -65,21 +89,26 @@ class Sources extends React.Component<Props> {
       return <Loading />;
     }
 
-    return (
-      <>
-        {this.renderBranchSelector()}
-        <FileTree
-          repository={repository}
-          revision={revision}
-          path={path}
-          baseUrl={baseUrl}
-        />
-      </>
-    );
+    if (currentFileIsDirectory) {
+      return (
+        <>
+          {this.renderBranchSelector()}
+          <FileTree
+            repository={repository}
+            revision={revision}
+            path={path}
+            baseUrl={baseUrl}
+          />
+        </>
+      );
+    } else {
+      return <Content />;
+    }
   }
 
   renderBranchSelector = () => {
     const { repository, branches, revision } = this.props;
+
     if (repository._links.branches) {
       return (
         <BranchSelector
@@ -99,10 +128,10 @@ const mapStateToProps = (state, ownProps) => {
   const { repository, match } = ownProps;
   const { revision, path } = match.params;
   const decodedRevision = revision ? decodeURIComponent(revision) : undefined;
-
   const loading = isFetchBranchesPending(state, repository);
   const error = getFetchBranchesFailure(state, repository);
   const branches = getBranches(state, repository);
+  const currentFileIsDirectory = isDirectory(state, repository, revision, path);
 
   return {
     repository,
@@ -110,7 +139,8 @@ const mapStateToProps = (state, ownProps) => {
     path,
     loading,
     error,
-    branches
+    branches,
+    currentFileIsDirectory
   };
 };
 
@@ -118,6 +148,9 @@ const mapDispatchToProps = dispatch => {
   return {
     fetchBranches: (repository: Repository) => {
       dispatch(fetchBranches(repository));
+    },
+    fetchSources: (repository: Repository, revision: string, path: string) => {
+      dispatch(fetchSources(repository, revision, path));
     }
   };
 };
diff --git a/scm-ui/src/repos/sources/modules/sources.js b/scm-ui/src/repos/sources/modules/sources.js
index 719770d75c..641c1550b6 100644
--- a/scm-ui/src/repos/sources/modules/sources.js
+++ b/scm-ui/src/repos/sources/modules/sources.js
@@ -102,6 +102,20 @@ export default function reducer(
 
 // selectors
 
+export function isDirectory(
+  state: any,
+  repository: Repository,
+  revision: string,
+  path: string
+): boolean {
+  const currentFile = getSources(state, repository, revision, path);
+  if (currentFile && !currentFile.directory) {
+    return false;
+  } else {
+    return true; //also return true if no currentFile is found since it is the "default" path
+  }
+}
+
 export function getSources(
   state: any,
   repository: Repository,
diff --git a/scm-ui/src/repos/sources/modules/sources.test.js b/scm-ui/src/repos/sources/modules/sources.test.js
index 068fa39e8f..f6336bba53 100644
--- a/scm-ui/src/repos/sources/modules/sources.test.js
+++ b/scm-ui/src/repos/sources/modules/sources.test.js
@@ -1,6 +1,6 @@
 // @flow
 
-import type { Repository } from "@scm-manager/ui-types";
+import type { Repository, File } from "@scm-manager/ui-types";
 import configureMockStore from "redux-mock-store";
 import thunk from "redux-thunk";
 import fetchMock from "fetch-mock";
@@ -14,7 +14,8 @@ import {
   isFetchSourcesPending,
   default as reducer,
   getSources,
-  fetchSourcesSuccess
+  fetchSourcesSuccess,
+  isDirectory
 } from "./sources";
 
 const sourcesUrl =
@@ -79,6 +80,42 @@ const collection = {
   }
 };
 
+const noDirectory: File = {
+  name: "src",
+  path: "src",
+  directory: true,
+  length: 176,
+  revision: "abc",
+  _links: {
+    self: {
+      href:
+        "http://localhost:8081/scm/rest/api/v2/repositories/scm/core/sources/76aae4bb4ceacf0e88938eb5b6832738b7d537b4/src"
+    }
+  },
+  _embedded: collection
+};
+
+const directory: File = {
+  name: "package.json",
+  path: "package.json",
+  directory: false,
+  description: "bump version",
+  length: 780,
+  lastModified: "2017-07-31T11:17:19Z",
+  revision: "abc",
+  _links: {
+    self: {
+      href:
+        "http://localhost:8081/scm/rest/api/v2/repositories/scm/core/content/76aae4bb4ceacf0e88938eb5b6832738b7d537b4/package.json"
+    },
+    history: {
+      href:
+        "http://localhost:8081/scm/rest/api/v2/repositories/scm/core/sources/history/76aae4bb4ceacf0e88938eb5b6832738b7d537b4/package.json"
+    }
+  },
+  _embedded: {}
+};
+
 describe("sources fetch", () => {
   const mockStore = configureMockStore([thunk]);
 
@@ -168,6 +205,28 @@ describe("reducer tests", () => {
 });
 
 describe("selector tests", () => {
+  it("should return false if it is no directory", () => {
+    const state = {
+      sources: {
+        "scm/core/abc/src/main/package.json": {
+          noDirectory
+        }
+      }
+    };
+    expect(
+      isDirectory(state, repository, "abc", "src/main/package.json")
+    ).toBeFalsy();
+  });
+
+  it("should return true if it is directory", () => {
+    const state = {
+      sources: {
+        "scm/core/abc/src": noDirectory
+      }
+    };
+    expect(isDirectory(state, repository, "abc", "src")).toBe(true);
+  });
+
   it("should return null", () => {
     expect(getSources({}, repository)).toBeFalsy();
   });
@@ -181,7 +240,7 @@ describe("selector tests", () => {
     expect(getSources(state, repository)).toBe(collection);
   });
 
-  it("should return the source collection without revision and path", () => {
+  it("should return the source collection with revision and path", () => {
     const state = {
       sources: {
         "scm/core/abc/src/main": collection

From bda5b4127114fd96982d19d97c6f18b92b2e1c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 25 Oct 2018 12:34:32 +0200
Subject: [PATCH 017/188] Add transaction id to http request

---
 .../sonia/scm/api/v2/resources/ErrorDto.java    |  3 ++-
 .../main/java/sonia/scm/filter/MDCFilter.java   | 17 ++++++++++-------
 .../src/main/resources/logback.default.xml      |  2 +-
 .../src/main/resources/logback.release.xml      |  4 ++--
 .../java/sonia/scm/filter/MDCFilterTest.java    |  1 +
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
index 8e97eabf8e..3ebcdc6e8e 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
@@ -2,6 +2,7 @@ package sonia.scm.api.v2.resources;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
+import org.slf4j.MDC;
 import sonia.scm.ContextEntry;
 import sonia.scm.NotFoundException;
 
@@ -29,6 +30,6 @@ public class ErrorDto {
   }
 
   static ErrorDto from(NotFoundException notFoundException) {
-    return new ErrorDto("todo", "todo", notFoundException.getContext(), notFoundException.getMessage());
+    return new ErrorDto(MDC.get("transaction_id"), "todo", notFoundException.getContext(), notFoundException.getMessage());
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java
index ffc976198c..b77a927a2d 100644
--- a/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java
@@ -41,6 +41,8 @@ import org.apache.shiro.subject.Subject;
 import org.slf4j.MDC;
 
 import sonia.scm.SCMContext;
+import sonia.scm.security.DefaultKeyGenerator;
+import sonia.scm.security.KeyGenerator;
 import sonia.scm.web.filter.HttpFilter;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -61,27 +63,26 @@ import sonia.scm.Priority;
 @WebElement(Filters.PATTERN_ALL)
 public class MDCFilter extends HttpFilter
 {
+  private static final DefaultKeyGenerator TRANSACTION_KEY_GENERATOR = new DefaultKeyGenerator();
 
-  /** Field description */
   @VisibleForTesting
   static final String MDC_CLIENT_HOST = "client_host";
 
-  /** Field description */
   @VisibleForTesting
   static final String MDC_CLIENT_IP = "client_ip";
-  
-  /** url of the current request */
+
   @VisibleForTesting
   static final String MDC_REQUEST_URI = "request_uri";
-  
-  /** request method */
+
   @VisibleForTesting
   static final String MDC_REQUEST_METHOD = "request_method";
 
-  /** Field description */
   @VisibleForTesting
   static final String MDC_USERNAME = "username";
 
+  @VisibleForTesting
+  static final String MDC_TRANSACTION_ID = "transaction_id";
+
   //~--- methods --------------------------------------------------------------
 
   /**
@@ -105,6 +106,7 @@ public class MDCFilter extends HttpFilter
     MDC.put(MDC_CLIENT_HOST, request.getRemoteHost());
     MDC.put(MDC_REQUEST_METHOD, request.getMethod());
     MDC.put(MDC_REQUEST_URI, request.getRequestURI());
+    MDC.put(MDC_TRANSACTION_ID, TRANSACTION_KEY_GENERATOR.createKey());
 
     try
     {
@@ -117,6 +119,7 @@ public class MDCFilter extends HttpFilter
       MDC.remove(MDC_CLIENT_HOST);
       MDC.remove(MDC_REQUEST_METHOD);
       MDC.remove(MDC_REQUEST_URI);
+      MDC.remove(MDC_TRANSACTION_ID);
     }
   }
 
diff --git a/scm-webapp/src/main/resources/logback.default.xml b/scm-webapp/src/main/resources/logback.default.xml
index 33e914d04d..d03c5a5012 100644
--- a/scm-webapp/src/main/resources/logback.default.xml
+++ b/scm-webapp/src/main/resources/logback.default.xml
@@ -46,7 +46,7 @@
     <!-- encoders are  by default assigned the type
          ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
     <encoder>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%-10X{transaction_id}] %-5level %logger - %msg%n</pattern>
     </encoder>
   </appender>
   
diff --git a/scm-webapp/src/main/resources/logback.release.xml b/scm-webapp/src/main/resources/logback.release.xml
index 4cf5906581..03ac987992 100644
--- a/scm-webapp/src/main/resources/logback.release.xml
+++ b/scm-webapp/src/main/resources/logback.release.xml
@@ -61,14 +61,14 @@
 
     <append>true</append>
     <encoder>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%-10X{transaction_id}] %-5level %logger - %msg%n</pattern>
     </encoder>
   </appender>
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 
     <encoder>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%-10X{transaction_id}] %-5level %logger - %msg%n</pattern>
     </encoder>
     
   </appender>
diff --git a/scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java b/scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java
index 56e1a74572..efd3dbbbc0 100644
--- a/scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/filter/MDCFilterTest.java
@@ -101,6 +101,7 @@ public class MDCFilterTest extends AbstractTestBase {
     assertEquals("127.0.0.1", chain.ctx.get(MDCFilter.MDC_CLIENT_IP));
     assertEquals("localhost", chain.ctx.get(MDCFilter.MDC_CLIENT_HOST));
     assertEquals("GET", chain.ctx.get(MDCFilter.MDC_REQUEST_METHOD));
+    assertNotNull(chain.ctx.get(MDCFilter.MDC_TRANSACTION_ID));
   }
   
   /**

From c214c9e1e4f22c4d57c3e721333aa8056d8bbac9 Mon Sep 17 00:00:00 2001
From: Mohamed Karray <mohamed.karray.sr@gmail.com>
Date: Thu, 25 Oct 2018 13:36:40 +0200
Subject: [PATCH 018/188] fix git diff format

---
 .../scm/repository/spi/SCMSvnDiffGenerator.java      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
index f714a955c7..c46ce5f534 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
@@ -587,8 +587,9 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
   private String getHeaderString(SvnTarget target, String displayPath, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
     final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
     try {
-      boolean stopDisplaying = displayHeader(byteArrayOutputStream, displayPath, deleted, added, operation);
-      if (useGitFormat) {
+      if (!useGitFormat) {
+        displayHeader(byteArrayOutputStream, displayPath, deleted, added, operation);
+      } else {
         displayGitDiffHeader(byteArrayOutputStream, operation,
           getRelativeToRootPath(target, originalTarget1),
           getRelativeToRootPath(target, originalTarget2),
@@ -887,7 +888,7 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
       displayString(outputStream, " ");
       displaySecondGitPath(outputStream, path2);
       displayEOL(outputStream);
-      displayString(outputStream, "new file mode 10644");
+      displayString(outputStream, "new file mode 100644");
       displayEOL(outputStream);
     } catch (IOException e) {
       wrapException(e);
@@ -901,7 +902,7 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
       displayString(outputStream, " ");
       displaySecondGitPath(outputStream, path2);
       displayEOL(outputStream);
-      displayString(outputStream, "deleted file mode 10644");
+      displayString(outputStream, "deleted file mode 100644");
       displayEOL(outputStream);
     } catch (IOException e) {
       wrapException(e);
@@ -1011,6 +1012,9 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
   }
 
   protected String getLabel(String path, String revToken) {
+    if (useGitFormat){
+      return path;
+    }
     revToken = revToken == null ? WC_REVISION_LABEL : revToken;
     return path + "\t" + revToken;
   }

From c7684b835af3c7ba2d55fd0624a08a728044afa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 25 Oct 2018 13:45:52 +0200
Subject: [PATCH 019/188] get contextType

---
 .../packages/ui-components/src/apiclient.js   |  8 ++-
 .../src/repos/content/components/Content.js   | 49 ++++++++++++++++---
 .../src/repos/sources/containers/Sources.js   | 10 ++--
 3 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/scm-ui-components/packages/ui-components/src/apiclient.js b/scm-ui-components/packages/ui-components/src/apiclient.js
index 4c648a59f6..bd19dcdf14 100644
--- a/scm-ui-components/packages/ui-components/src/apiclient.js
+++ b/scm-ui-components/packages/ui-components/src/apiclient.js
@@ -48,8 +48,12 @@ class ApiClient {
     return this.httpRequestWithJSONBody("PUT", url, contentType, payload);
   }
 
-  head(url: string, payload: any, contentType: string = "application/json") {
-    return this.httpRequestWithJSONBody("HEAD", url, contentType, payload);
+  head(url: string) {
+    let options: RequestOptions = {
+      method: "HEAD"
+    };
+    options = Object.assign(options, fetchOptions);
+    return fetch(createUrl(url), options).then(handleStatusCode);
   }
 
   delete(url: string): Promise<Response> {
diff --git a/scm-ui/src/repos/content/components/Content.js b/scm-ui/src/repos/content/components/Content.js
index edf46454ae..ecd3352836 100644
--- a/scm-ui/src/repos/content/components/Content.js
+++ b/scm-ui/src/repos/content/components/Content.js
@@ -2,9 +2,23 @@
 import React from "react";
 import { translate } from "react-i18next";
 import { apiClient } from "@scm-manager/ui-components";
+import { getSources } from "../../sources/modules/sources";
+import type { Repository, File } from "@scm-manager/ui-types";
+import { ErrorNotification, Loading } from "@scm-manager/ui-components";
+import { connect } from "react-redux";
 
 type Props = {
-  t: string => string
+  t: string => string,
+  loading: boolean,
+  error: Error,
+  file: File,
+  repository: Repository,
+  revision: string,
+  path: string,
+  // context props
+  classes: any,
+  t: string => string,
+  match: any
 };
 
 type State = {
@@ -20,20 +34,43 @@ class Content extends React.Component<Props, State> {
     };
   }
 
-  componentDidMount() {}
+  componentDidMount() {
+    const { file } = this.props;
+    getContentType(file._links.self.href).then(result => {
+      this.setState({
+        contentType: result
+      });
+    });
+  }
 
   render() {
-    return "Hallo here is content";
+    const { file } = this.props;
+    if (!file) {
+      return <Loading />;
+    }
+    return this.state.contentType;
   }
 }
 
-export function getContentType(url: string) {
+export function getContentType(url: string, state: any) {
   return apiClient
     .head(url)
-    .then(response => response.headers.get("Content-Type"))
+    .then(response => {
+      return response.headers.get("Content-Type");
+    })
     .catch(err => {
       return null;
     });
 }
 
-export default translate("repos")(Content);
+const mapStateToProps = (state: any, ownProps: Props) => {
+  const { repository, revision, path } = ownProps;
+
+  const file = getSources(state, repository, revision, path);
+
+  return {
+    file
+  };
+};
+
+export default connect(mapStateToProps)(translate("repos")(Content));
diff --git a/scm-ui/src/repos/sources/containers/Sources.js b/scm-ui/src/repos/sources/containers/Sources.js
index a31a15353f..d27b2e24eb 100644
--- a/scm-ui/src/repos/sources/containers/Sources.js
+++ b/scm-ui/src/repos/sources/containers/Sources.js
@@ -14,7 +14,7 @@ import {
 } from "../../modules/branches";
 import { compose } from "redux";
 import Content from "../../content/components/Content";
-import { fetchSources, isDirectory } from "../modules/sources";
+import {fetchSources, isDirectory} from "../modules/sources";
 
 type Props = {
   repository: Repository,
@@ -102,7 +102,11 @@ class Sources extends React.Component<Props> {
         </>
       );
     } else {
-      return <Content />;
+      return <Content
+        repository={repository}
+        revision={revision}
+        path={path}
+      />;
     }
   }
 
@@ -140,7 +144,7 @@ const mapStateToProps = (state, ownProps) => {
     loading,
     error,
     branches,
-    currentFileIsDirectory
+    currentFileIsDirectory,
   };
 };
 

From d185743ef057d229fbadbba3b55dac213071037e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 25 Oct 2018 13:48:00 +0200
Subject: [PATCH 020/188] Create error response for concurrent modifications

---
 .../scm/ConcurrentModificationException.java  | 32 ++++++++++++++++++-
 .../java/sonia/scm/NotFoundException.java     |  8 ++---
 .../sonia/scm/user/UserManagerTestBase.java   |  8 ++---
 ...ConcurrentModificationExceptionMapper.java |  4 ++-
 .../sonia/scm/api/v2/resources/ErrorDto.java  |  5 +++
 .../scm/api/v2/resources/GroupResource.java   |  2 +-
 .../resources/IdResourceManagerAdapter.java   |  2 +-
 .../api/v2/resources/RepositoryResource.java  |  5 +--
 .../SingleResourceManagerAdapter.java         |  6 ++--
 .../scm/api/v2/resources/UserResource.java    |  2 +-
 10 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java b/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
index f0340a6a59..f0129093a3 100644
--- a/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
+++ b/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
@@ -1,4 +1,34 @@
 package sonia.scm;
 
-public class ConcurrentModificationException extends Exception {
+import java.util.Collections;
+import java.util.List;
+
+import static java.util.Collections.unmodifiableList;
+import static java.util.stream.Collectors.joining;
+
+public class ConcurrentModificationException extends RuntimeException {
+  private final List<ContextEntry> context;
+
+  public ConcurrentModificationException(Class type, String id) {
+    this(Collections.singletonList(new ContextEntry(type, id)));
+  }
+
+  public ConcurrentModificationException(String type, String id) {
+    this(Collections.singletonList(new ContextEntry(type, id)));
+  }
+
+  private ConcurrentModificationException(List<ContextEntry> context) {
+    super(createMessage(context));
+    this.context = context;
+  }
+
+  public List<ContextEntry> getContext() {
+    return unmodifiableList(context);
+  }
+
+  private static String createMessage(List<ContextEntry> context) {
+    return context.stream()
+      .map(c -> c.getType().toLowerCase() + " with id " + c.getId())
+      .collect(joining(" in ", "", " has been modified concurrently"));
+  }
 }
diff --git a/scm-core/src/main/java/sonia/scm/NotFoundException.java b/scm-core/src/main/java/sonia/scm/NotFoundException.java
index d562a674bb..36b4d37cb1 100644
--- a/scm-core/src/main/java/sonia/scm/NotFoundException.java
+++ b/scm-core/src/main/java/sonia/scm/NotFoundException.java
@@ -15,14 +15,15 @@ public class NotFoundException extends RuntimeException {
   private final List<ContextEntry> context;
 
   public NotFoundException(Class type, String id) {
-    this.context = Collections.singletonList(new ContextEntry(type, id));
+    this(Collections.singletonList(new ContextEntry(type, id)));
   }
 
   public NotFoundException(String type, String id) {
-    this.context = Collections.singletonList(new ContextEntry(type, id));
+    this(Collections.singletonList(new ContextEntry(type, id)));
   }
 
   private NotFoundException(List<ContextEntry> context) {
+    super(createMessage(context));
     this.context = context;
   }
 
@@ -46,8 +47,7 @@ public class NotFoundException extends RuntimeException {
     return unmodifiableList(context);
   }
 
-  @Override
-  public String getMessage() {
+  private static String createMessage(List<ContextEntry> context) {
     return context.stream()
       .map(c -> c.getType().toLowerCase() + " with id " + c.getId())
       .collect(joining(" in ", "could not find ", ""));
diff --git a/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java b/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
index dddce344ce..9fe8669fc9 100644
--- a/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
+++ b/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
@@ -97,7 +97,7 @@ public abstract class UserManagerTestBase extends ManagerTestBase<User> {
   }
 
   @Test(expected = NotFoundException.class)
-  public void testDeleteNotFound() throws Exception {
+  public void testDeleteNotFound() {
     manager.delete(UserTestData.createDent());
   }
 
@@ -181,7 +181,7 @@ public abstract class UserManagerTestBase extends ManagerTestBase<User> {
   }
 
   @Test
-  public void testModify() throws AlreadyExistsException, NotFoundException, ConcurrentModificationException {
+  public void testModify() throws AlreadyExistsException {
     User zaphod = UserTestData.createZaphod();
 
     manager.create(zaphod);
@@ -238,7 +238,7 @@ public abstract class UserManagerTestBase extends ManagerTestBase<User> {
   }
 
   @Test
-  public void testRefresh() throws AlreadyExistsException, NotFoundException {
+  public void testRefresh() throws AlreadyExistsException {
     User zaphod = UserTestData.createZaphod();
 
     manager.create(zaphod);
@@ -299,7 +299,7 @@ public abstract class UserManagerTestBase extends ManagerTestBase<User> {
       return user;
     }
 
-    private void modifyAndDeleteUser(User user) throws IOException, NotFoundException, ConcurrentModificationException {
+    private void modifyAndDeleteUser(User user) {
       String name = user.getName();
       String nd = name.concat(" new displayname");
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/ConcurrentModificationExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/ConcurrentModificationExceptionMapper.java
index d01b2fd7de..49aed6a29a 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/ConcurrentModificationExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/ConcurrentModificationExceptionMapper.java
@@ -1,6 +1,8 @@
 package sonia.scm.api.rest;
 
 import sonia.scm.ConcurrentModificationException;
+import sonia.scm.api.v2.resources.ErrorDto;
+import sonia.scm.web.VndMediaType;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -10,6 +12,6 @@ import javax.ws.rs.ext.Provider;
 public class ConcurrentModificationExceptionMapper implements ExceptionMapper<ConcurrentModificationException> {
   @Override
   public Response toResponse(ConcurrentModificationException exception) {
-    return Response.status(Response.Status.CONFLICT).build();
+    return Response.status(Response.Status.CONFLICT).entity(ErrorDto.from(exception)).type(VndMediaType.ERROR_TYPE).build();
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
index 3ebcdc6e8e..3b43c37c5a 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
@@ -3,6 +3,7 @@ package sonia.scm.api.v2.resources;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
 import org.slf4j.MDC;
+import sonia.scm.ConcurrentModificationException;
 import sonia.scm.ContextEntry;
 import sonia.scm.NotFoundException;
 
@@ -32,4 +33,8 @@ public class ErrorDto {
   static ErrorDto from(NotFoundException notFoundException) {
     return new ErrorDto(MDC.get("transaction_id"), "todo", notFoundException.getContext(), notFoundException.getMessage());
   }
+
+  public static ErrorDto from(ConcurrentModificationException concurrentModificationException) {
+    return new ErrorDto(MDC.get("transaction_id"), "todo", concurrentModificationException.getContext(), concurrentModificationException.getMessage());
+  }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java
index 789a9847cb..308b40b1a5 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java
@@ -98,7 +98,7 @@ public class GroupResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
-  public Response update(@PathParam("id") String name, @Valid GroupDto groupDto) throws ConcurrentModificationException {
+  public Response update(@PathParam("id") String name, @Valid GroupDto groupDto) {
     return adapter.update(name, existing -> dtoToGroupMapper.map(groupDto));
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IdResourceManagerAdapter.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IdResourceManagerAdapter.java
index 533bc49da0..d2e4bd856a 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IdResourceManagerAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IdResourceManagerAdapter.java
@@ -39,7 +39,7 @@ class IdResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
     return singleAdapter.get(loadBy(id), mapToDto);
   }
 
-  public Response update(String id, Function<MODEL_OBJECT, MODEL_OBJECT> applyChanges) throws ConcurrentModificationException {
+  public Response update(String id, Function<MODEL_OBJECT, MODEL_OBJECT> applyChanges) {
     return singleAdapter.update(
       loadBy(id),
       applyChanges,
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
index 77df2d8e50..f8b56229b1 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
@@ -138,7 +138,7 @@ public class RepositoryResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
-  public Response update(@PathParam("namespace") String namespace, @PathParam("name") String name, @Valid RepositoryDto repositoryDto) throws ConcurrentModificationException {
+  public Response update(@PathParam("namespace") String namespace, @PathParam("name") String name, @Valid RepositoryDto repositoryDto) {
     return adapter.update(
       loadBy(namespace, name),
       existing -> processUpdate(repositoryDto, existing),
@@ -204,7 +204,8 @@ public class RepositoryResource {
   }
 
   private Supplier<Repository> loadBy(String namespace, String name) {
-    return () -> Optional.ofNullable(manager.get(new NamespaceAndName(namespace, name))).orElseThrow(() -> new NotFoundException(Repository.class, namespace + "/" + name));
+    NamespaceAndName namespaceAndName = new NamespaceAndName(namespace, name);
+    return () -> Optional.ofNullable(manager.get(namespaceAndName)).orElseThrow(() -> NotFoundException.notFound(namespaceAndName).build());
   }
 
   private Predicate<Repository> nameAndNamespaceStaysTheSame(String namespace, String name) {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
index 334dc72b20..963f25eaf6 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
@@ -33,6 +33,7 @@ class SingleResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
                              DTO extends HalRepresentation> extends AbstractManagerResource<MODEL_OBJECT> {
 
   private final Function<Throwable, Optional<Response>> errorHandler;
+  private final Class<MODEL_OBJECT> type;
 
   SingleResourceManagerAdapter(Manager<MODEL_OBJECT> manager, Class<MODEL_OBJECT> type) {
     this(manager, type, e -> Optional.empty());
@@ -44,6 +45,7 @@ class SingleResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
     Function<Throwable, Optional<Response>> errorHandler) {
     super(manager, type);
     this.errorHandler = errorHandler;
+    this.type = type;
   }
 
   /**
@@ -58,14 +60,14 @@ class SingleResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
    * Update the model object for the given id according to the given function and returns a corresponding http response.
    * This handles all corner cases, eg. no matching object for the id or missing privileges.
    */
-  Response update(Supplier<MODEL_OBJECT> reader, Function<MODEL_OBJECT, MODEL_OBJECT> applyChanges, Predicate<MODEL_OBJECT> hasSameKey) throws ConcurrentModificationException {
+  Response update(Supplier<MODEL_OBJECT> reader, Function<MODEL_OBJECT, MODEL_OBJECT> applyChanges, Predicate<MODEL_OBJECT> hasSameKey) {
     MODEL_OBJECT existingModelObject = reader.get();
     MODEL_OBJECT changedModelObject = applyChanges.apply(existingModelObject);
     if (!hasSameKey.test(changedModelObject)) {
       return Response.status(BAD_REQUEST).entity("illegal change of id").build();
     }
     else if (modelObjectWasModifiedConcurrently(existingModelObject, changedModelObject)) {
-      throw new ConcurrentModificationException();
+      throw new ConcurrentModificationException(type, existingModelObject.getId());
     }
     return update(getId(existingModelObject), changedModelObject);
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
index ef4b8a6eb4..c2fbc00453 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
@@ -101,7 +101,7 @@ public class UserResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
-  public Response update(@PathParam("id") String name, @Valid UserDto userDto) throws ConcurrentModificationException {
+  public Response update(@PathParam("id") String name, @Valid UserDto userDto) {
     return adapter.update(name, existing -> dtoToUserMapper.map(userDto, existing.getPassword()));
   }
 

From bfdb58797bf174578595c4a229884cabb0777122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 25 Oct 2018 13:59:13 +0200
Subject: [PATCH 021/188] use decoded revision, otherwise feature names with a
 slash are handled wrong

---
 scm-ui/src/repos/content/components/Content.js |  2 ++
 scm-ui/src/repos/sources/containers/Sources.js | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/scm-ui/src/repos/content/components/Content.js b/scm-ui/src/repos/content/components/Content.js
index ecd3352836..124407dc1f 100644
--- a/scm-ui/src/repos/content/components/Content.js
+++ b/scm-ui/src/repos/content/components/Content.js
@@ -45,9 +45,11 @@ class Content extends React.Component<Props, State> {
 
   render() {
     const { file } = this.props;
+    const contentType = this.state.contentType;
     if (!file) {
       return <Loading />;
     }
+
     return this.state.contentType;
   }
 }
diff --git a/scm-ui/src/repos/sources/containers/Sources.js b/scm-ui/src/repos/sources/containers/Sources.js
index d27b2e24eb..9a862a0996 100644
--- a/scm-ui/src/repos/sources/containers/Sources.js
+++ b/scm-ui/src/repos/sources/containers/Sources.js
@@ -14,7 +14,7 @@ import {
 } from "../../modules/branches";
 import { compose } from "redux";
 import Content from "../../content/components/Content";
-import {fetchSources, isDirectory} from "../modules/sources";
+import { fetchSources, isDirectory } from "../modules/sources";
 
 type Props = {
   repository: Repository,
@@ -102,11 +102,9 @@ class Sources extends React.Component<Props> {
         </>
       );
     } else {
-      return <Content
-        repository={repository}
-        revision={revision}
-        path={path}
-      />;
+      return (
+        <Content repository={repository} revision={revision} path={path} />
+      );
     }
   }
 
@@ -135,7 +133,9 @@ const mapStateToProps = (state, ownProps) => {
   const loading = isFetchBranchesPending(state, repository);
   const error = getFetchBranchesFailure(state, repository);
   const branches = getBranches(state, repository);
-  const currentFileIsDirectory = isDirectory(state, repository, revision, path);
+  const currentFileIsDirectory = decodedRevision
+    ? isDirectory(state, repository, decodedRevision, path)
+    : isDirectory(state, repository, revision, path);
 
   return {
     repository,
@@ -144,7 +144,7 @@ const mapStateToProps = (state, ownProps) => {
     loading,
     error,
     branches,
-    currentFileIsDirectory,
+    currentFileIsDirectory
   };
 };
 

From 36f289a1531e2c56d5b03028f5b5394b9dcdfe76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 25 Oct 2018 14:03:45 +0200
Subject: [PATCH 022/188] open correct viewer for each type and reorder the
 structure

---
 .../components/content}/DownloadViewer.js     |  2 +-
 .../components/content}/ImageViewer.js        |  2 +-
 .../components/content}/SourcecodeViewer.js   |  4 +--
 .../content}/SourcecodeViewer.test.js         |  0
 .../containers}/Content.js                    | 26 +++++++++++++++----
 .../containers}/Content.test.js               |  0
 .../src/repos/sources/containers/Sources.js   |  2 +-
 7 files changed, 26 insertions(+), 10 deletions(-)
 rename scm-ui/src/repos/{content/components => sources/components/content}/DownloadViewer.js (93%)
 rename scm-ui/src/repos/{content/components => sources/components/content}/ImageViewer.js (94%)
 rename scm-ui/src/repos/{content/components => sources/components/content}/SourcecodeViewer.js (81%)
 rename scm-ui/src/repos/{content/components => sources/components/content}/SourcecodeViewer.test.js (100%)
 rename scm-ui/src/repos/{content/components => sources/containers}/Content.js (64%)
 rename scm-ui/src/repos/{content/components => sources/containers}/Content.test.js (100%)

diff --git a/scm-ui/src/repos/content/components/DownloadViewer.js b/scm-ui/src/repos/sources/components/content/DownloadViewer.js
similarity index 93%
rename from scm-ui/src/repos/content/components/DownloadViewer.js
rename to scm-ui/src/repos/sources/components/content/DownloadViewer.js
index f2e10b376c..9f5e9cdf75 100644
--- a/scm-ui/src/repos/content/components/DownloadViewer.js
+++ b/scm-ui/src/repos/sources/components/content/DownloadViewer.js
@@ -22,7 +22,7 @@ class DownloadViewer extends React.Component<Props, State> {
   componentDidMount() {}
 
   render() {
-    return null;
+    return "DownloadViewer";
   }
 }
 
diff --git a/scm-ui/src/repos/content/components/ImageViewer.js b/scm-ui/src/repos/sources/components/content/ImageViewer.js
similarity index 94%
rename from scm-ui/src/repos/content/components/ImageViewer.js
rename to scm-ui/src/repos/sources/components/content/ImageViewer.js
index de4fc840fa..0b5eae20d7 100644
--- a/scm-ui/src/repos/content/components/ImageViewer.js
+++ b/scm-ui/src/repos/sources/components/content/ImageViewer.js
@@ -22,7 +22,7 @@ class ImageViewer extends React.Component<Props, State> {
   componentDidMount() {}
 
   render() {
-    return null;
+    return "ImageViewer";
   }
 }
 
diff --git a/scm-ui/src/repos/content/components/SourcecodeViewer.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
similarity index 81%
rename from scm-ui/src/repos/content/components/SourcecodeViewer.js
rename to scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
index 6303bdd874..dacbbd6283 100644
--- a/scm-ui/src/repos/content/components/SourcecodeViewer.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
@@ -1,7 +1,7 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import { apiClient } from "@scm-manager/ui-components";
+import { apiClient } from "../../../../../../scm-ui-components/packages/ui-components/src/index";
 
 type Props = {
   t: string => string
@@ -23,7 +23,7 @@ class SourcecodeViewer extends React.Component<Props, State> {
   componentDidMount() {}
 
   render() {
-    return null;
+    return "sourceCodeViewer";
   }
 }
 
diff --git a/scm-ui/src/repos/content/components/SourcecodeViewer.test.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
similarity index 100%
rename from scm-ui/src/repos/content/components/SourcecodeViewer.test.js
rename to scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
diff --git a/scm-ui/src/repos/content/components/Content.js b/scm-ui/src/repos/sources/containers/Content.js
similarity index 64%
rename from scm-ui/src/repos/content/components/Content.js
rename to scm-ui/src/repos/sources/containers/Content.js
index 124407dc1f..3518a03468 100644
--- a/scm-ui/src/repos/content/components/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -1,11 +1,20 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import { apiClient } from "@scm-manager/ui-components";
-import { getSources } from "../../sources/modules/sources";
-import type { Repository, File } from "@scm-manager/ui-types";
-import { ErrorNotification, Loading } from "@scm-manager/ui-components";
+import { apiClient } from "../../../../../scm-ui-components/packages/ui-components/src/index";
+import { getSources } from "../modules/sources";
+import type {
+  Repository,
+  File
+} from "../../../../../scm-ui-components/packages/ui-types/src/index";
+import {
+  ErrorNotification,
+  Loading
+} from "../../../../../scm-ui-components/packages/ui-components/src/index";
 import { connect } from "react-redux";
+import ImageViewer from "../components/content/ImageViewer";
+import SourcecodeViewer from "../components/content/SourcecodeViewer";
+import DownloadViewer from "../components/content/DownloadViewer";
 
 type Props = {
   t: string => string,
@@ -49,8 +58,15 @@ class Content extends React.Component<Props, State> {
     if (!file) {
       return <Loading />;
     }
+    if (contentType.startsWith("image")) {
+      return <ImageViewer />;
+    }
 
-    return this.state.contentType;
+    if (contentType.startsWith("text")) {
+      return <SourcecodeViewer />;
+    }
+
+    return <DownloadViewer />;
   }
 }
 
diff --git a/scm-ui/src/repos/content/components/Content.test.js b/scm-ui/src/repos/sources/containers/Content.test.js
similarity index 100%
rename from scm-ui/src/repos/content/components/Content.test.js
rename to scm-ui/src/repos/sources/containers/Content.test.js
diff --git a/scm-ui/src/repos/sources/containers/Sources.js b/scm-ui/src/repos/sources/containers/Sources.js
index 9a862a0996..1a9f1d62e7 100644
--- a/scm-ui/src/repos/sources/containers/Sources.js
+++ b/scm-ui/src/repos/sources/containers/Sources.js
@@ -13,7 +13,7 @@ import {
   isFetchBranchesPending
 } from "../../modules/branches";
 import { compose } from "redux";
-import Content from "../../content/components/Content";
+import Content from "./Content";
 import { fetchSources, isDirectory } from "../modules/sources";
 
 type Props = {

From cab29ba509b49bf71c5a744463e17230f29ad27b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 25 Oct 2018 14:24:53 +0200
Subject: [PATCH 023/188] add error handling

---
 .../src/repos/sources/containers/Content.js   | 39 ++++++++++++++-----
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index 3518a03468..c5b64321f4 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -31,7 +31,9 @@ type Props = {
 };
 
 type State = {
-  contentType: string
+  contentType: string,
+  error: Error,
+  hasError: boolean
 };
 
 class Content extends React.Component<Props, State> {
@@ -39,25 +41,44 @@ class Content extends React.Component<Props, State> {
     super(props);
 
     this.state = {
-      contentType: ""
+      contentType: "",
+      error: new Error(),
+      hasError: false
     };
   }
 
   componentDidMount() {
     const { file } = this.props;
-    getContentType(file._links.self.href).then(result => {
-      this.setState({
-        contentType: result
-      });
-    });
+    getContentType(file._links.self.href)
+      .then(result => {
+        if (result.error) {
+          this.setState({
+            ...this.state,
+            hasError: true,
+            error: result.error
+          });
+        } else {
+          this.setState({
+            ...this.state,
+            contentType: result.type
+          });
+        }
+      })
+      .catch(err => {});
   }
 
   render() {
     const { file } = this.props;
     const contentType = this.state.contentType;
+    const error = this.state.error;
+    const hasError = this.state.hasError;
+
     if (!file) {
       return <Loading />;
     }
+    if (hasError) {
+      return <ErrorNotification error={error} />;
+    }
     if (contentType.startsWith("image")) {
       return <ImageViewer />;
     }
@@ -74,10 +95,10 @@ export function getContentType(url: string, state: any) {
   return apiClient
     .head(url)
     .then(response => {
-      return response.headers.get("Content-Type");
+      return { type: response.headers.get("Content-Type") };
     })
     .catch(err => {
-      return null;
+      return { error: err };
     });
 }
 

From 06d73f4ac87fed8c2f23dd5acd1087b79cf746e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 25 Oct 2018 14:37:26 +0200
Subject: [PATCH 024/188] correct input usage

---
 scm-ui/src/repos/sources/containers/Content.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index c5b64321f4..d8e536e0e1 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -1,16 +1,16 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import { apiClient } from "../../../../../scm-ui-components/packages/ui-components/src/index";
+import { apiClient } from "@scm-manager/ui-components";
 import { getSources } from "../modules/sources";
 import type {
   Repository,
   File
-} from "../../../../../scm-ui-components/packages/ui-types/src/index";
+} from "@scm-manager/ui-types";
 import {
   ErrorNotification,
   Loading
-} from "../../../../../scm-ui-components/packages/ui-components/src/index";
+} from "@scm-manager/ui-components";
 import { connect } from "react-redux";
 import ImageViewer from "../components/content/ImageViewer";
 import SourcecodeViewer from "../components/content/SourcecodeViewer";
@@ -87,7 +87,7 @@ class Content extends React.Component<Props, State> {
       return <SourcecodeViewer />;
     }
 
-    return <DownloadViewer />;
+    return <DownloadViewer file={file}/>;
   }
 }
 

From 6eb3c386556f4724e1f837919bb0cb87fb1af07d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 25 Oct 2018 15:31:42 +0200
Subject: [PATCH 025/188] Create error response for already existing entities

---
 .../sonia/scm/AlreadyExistsException.java     | 32 +++++++--
 .../scm/ConcurrentModificationException.java  |  2 +-
 .../src/main/java/sonia/scm/ContextEntry.java | 65 ++++++++++++++++---
 .../java/sonia/scm/ExceptionWithContext.java  |  9 +++
 .../src/main/java/sonia/scm/HandlerBase.java  | 10 +--
 scm-core/src/main/java/sonia/scm/Manager.java |  2 +-
 .../main/java/sonia/scm/ManagerDecorator.java |  2 +-
 .../java/sonia/scm/NotFoundException.java     | 49 ++------------
 .../scm/repository/AbstactImportHandler.java  |  3 +-
 .../AbstractSimpleRepositoryHandler.java      | 14 ++--
 .../scm/repository/RepositoryManager.java     |  3 +-
 .../RepositoryManagerDecorator.java           |  3 +-
 .../repository/api/BrowseCommandBuilder.java  |  1 -
 .../api/RepositoryServiceFactory.java         |  5 +-
 .../scm/repository/spi/BrowseCommand.java     |  1 -
 .../scm/repository/spi/HookEventFacade.java   |  6 +-
 .../scm/security/SyncingRealmHelperTest.java  |  9 ++-
 .../scm/repository/spi/GitBrowseCommand.java  |  4 +-
 .../scm/repository/spi/GitCatCommand.java     |  8 ++-
 .../scm/repository/spi/GitLogCommand.java     |  6 +-
 .../repository/spi/GitBrowseCommandTest.java  |  5 +-
 .../java/sonia/scm/repository/SvnUtil.java    |  8 ++-
 .../scm/repository/spi/SvnCatCommand.java     |  8 ++-
 .../repository/DummyRepositoryHandler.java    |  4 +-
 .../SimpleRepositoryHandlerTestBase.java      |  9 ++-
 .../sonia/scm/user/UserManagerTestBase.java   | 18 +++--
 .../java/sonia/scm/ManagerDaoAdapter.java     |  6 +-
 .../rest/AlreadyExistsExceptionMapper.java    |  5 +-
 .../resources/ChangePasswordResource.java     |  2 -
 .../resources/RepositoryImportResource.java   |  8 ---
 .../NotFoundExceptionMapper.java              |  4 +-
 .../api/v2/resources/BranchRootResource.java  |  5 +-
 .../CollectionResourceManagerAdapter.java     |  3 +-
 .../sonia/scm/api/v2/resources/ErrorDto.java  | 11 +---
 .../v2/resources/GroupCollectionResource.java |  3 +-
 .../scm/api/v2/resources/GroupResource.java   |  2 -
 .../resources/IdResourceManagerAdapter.java   |  4 +-
 .../v2/resources/PermissionRootResource.java  | 26 ++++----
 .../RepositoryCollectionResource.java         |  3 +-
 .../api/v2/resources/RepositoryResource.java  |  7 +-
 .../SingleResourceManagerAdapter.java         |  1 -
 .../scm/api/v2/resources/TagRootResource.java |  5 +-
 .../v2/resources/UserCollectionResource.java  |  3 +-
 .../scm/api/v2/resources/UserResource.java    |  1 -
 .../sonia/scm/group/DefaultGroupManager.java  |  3 +-
 .../repository/DefaultRepositoryManager.java  | 11 ++--
 .../sonia/scm/repository/HealthChecker.java   |  1 -
 .../sonia/scm/user/DefaultUserManager.java    |  3 +-
 .../java/sonia/scm/web/i18n/I18nServlet.java  |  5 +-
 .../resources/ChangesetRootResourceTest.java  |  1 +
 .../api/v2/resources/DiffResourceTest.java    |  1 +
 .../scm/api/v2/resources/DispatcherMock.java  |  1 +
 .../v2/resources/FileHistoryResourceTest.java |  1 +
 .../resources/ModificationsResourceTest.java  |  1 +
 .../resources/PermissionRootResourceTest.java | 10 +--
 .../api/v2/resources/TagRootResourceTest.java |  1 +
 .../DefaultRepositoryManagerTest.java         | 48 +++++++-------
 .../scm/user/DefaultUserManagerTest.java      |  3 -
 58 files changed, 249 insertions(+), 226 deletions(-)
 create mode 100644 scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
 rename scm-webapp/src/main/java/sonia/scm/api/v2/{resources => }/NotFoundExceptionMapper.java (96%)

diff --git a/scm-core/src/main/java/sonia/scm/AlreadyExistsException.java b/scm-core/src/main/java/sonia/scm/AlreadyExistsException.java
index 4c6a52b878..95fc24ecb2 100644
--- a/scm-core/src/main/java/sonia/scm/AlreadyExistsException.java
+++ b/scm-core/src/main/java/sonia/scm/AlreadyExistsException.java
@@ -1,11 +1,35 @@
 package sonia.scm;
 
-public class AlreadyExistsException extends Exception {
+import java.util.List;
 
-  public AlreadyExistsException(String message) {
-    super(message);
+import static java.util.Collections.singletonList;
+import static java.util.Collections.unmodifiableList;
+import static java.util.stream.Collectors.joining;
+
+public class AlreadyExistsException extends RuntimeException implements ExceptionWithContext {
+
+  private final List<ContextEntry> context;
+
+  public AlreadyExistsException(ModelObject object) {
+    this(singletonList(new ContextEntry(object.getClass(), object.getId())));
   }
 
-  public AlreadyExistsException() {
+  public static AlreadyExistsException alreadyExists(ContextEntry.ContextBuilder builder) {
+    return new AlreadyExistsException(builder.build());
+  }
+
+  private AlreadyExistsException(List<ContextEntry> context) {
+    super(createMessage(context));
+    this.context = context;
+  }
+
+  public List<ContextEntry> getContext() {
+    return unmodifiableList(context);
+  }
+
+  private static String createMessage(List<ContextEntry> context) {
+    return context.stream()
+      .map(c -> c.getType().toLowerCase() + " with id " + c.getId())
+      .collect(joining(" in ", "", " already exists"));
   }
 }
diff --git a/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java b/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
index f0129093a3..2a3e65781d 100644
--- a/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
+++ b/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
@@ -6,7 +6,7 @@ import java.util.List;
 import static java.util.Collections.unmodifiableList;
 import static java.util.stream.Collectors.joining;
 
-public class ConcurrentModificationException extends RuntimeException {
+public class ConcurrentModificationException extends RuntimeException implements ExceptionWithContext {
   private final List<ContextEntry> context;
 
   public ConcurrentModificationException(Class type, String id) {
diff --git a/scm-core/src/main/java/sonia/scm/ContextEntry.java b/scm-core/src/main/java/sonia/scm/ContextEntry.java
index 2dbccbacf7..591f29972a 100644
--- a/scm-core/src/main/java/sonia/scm/ContextEntry.java
+++ b/scm-core/src/main/java/sonia/scm/ContextEntry.java
@@ -1,7 +1,13 @@
 package sonia.scm;
 
+import sonia.scm.repository.NamespaceAndName;
+import sonia.scm.repository.Repository;
 import sonia.scm.util.AssertUtil;
 
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
 public class ContextEntry {
   private final String type;
   private final String id;
@@ -11,17 +17,60 @@ public class ContextEntry {
   }
 
   ContextEntry(String type, String id) {
-      AssertUtil.assertIsNotEmpty(type);
-      AssertUtil.assertIsNotEmpty(id);
-      this.type = type;
-      this.id = id;
+    AssertUtil.assertIsNotEmpty(type);
+    AssertUtil.assertIsNotEmpty(id);
+    this.type = type;
+    this.id = id;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+
+  public static class ContextBuilder {
+    private final List<ContextEntry> context = new LinkedList<>();
+
+    public static ContextBuilder entity(Repository repository) {
+      return new ContextBuilder().in(repository.getNamespaceAndName());
     }
 
-    public String getType () {
-      return type;
+    public static ContextBuilder entity(NamespaceAndName namespaceAndName) {
+      return new ContextBuilder().in(Repository.class, namespaceAndName.logString());
     }
 
-    public String getId () {
-      return id;
+    public static ContextBuilder entity(Class type, String id) {
+      return new ContextBuilder().in(type, id);
+    }
+
+    public static ContextBuilder entity(String type, String id) {
+      return new ContextBuilder().in(type, id);
+    }
+
+    public ContextBuilder in(Repository repository) {
+      return in(repository.getNamespaceAndName());
+    }
+
+    public ContextBuilder in(NamespaceAndName namespaceAndName) {
+      return this.in(Repository.class, namespaceAndName.logString());
+    }
+
+    public ContextBuilder in(Class type, String id) {
+      context.add(new ContextEntry(type, id));
+      return this;
+    }
+
+    public ContextBuilder in(String type, String id) {
+      context.add(new ContextEntry(type, id));
+      return this;
+    }
+
+    public List<ContextEntry> build() {
+      return Collections.unmodifiableList(context);
     }
   }
+}
diff --git a/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java b/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
new file mode 100644
index 0000000000..d10411ca9a
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
@@ -0,0 +1,9 @@
+package sonia.scm;
+
+import java.util.List;
+
+public interface ExceptionWithContext {
+  List<ContextEntry> getContext();
+
+  String getMessage();
+}
diff --git a/scm-core/src/main/java/sonia/scm/HandlerBase.java b/scm-core/src/main/java/sonia/scm/HandlerBase.java
index bbe78c8cf7..a621f4f697 100644
--- a/scm-core/src/main/java/sonia/scm/HandlerBase.java
+++ b/scm-core/src/main/java/sonia/scm/HandlerBase.java
@@ -54,25 +54,21 @@ public interface HandlerBase<T extends TypedObject>
    *
    * @return  The persisted object.
    */
-  T create(T object) throws AlreadyExistsException;
+  T create(T object);
 
   /**
    * Removes a persistent object.
    *
    *
    * @param object to delete
-   *
-   * @throws IOException
    */
-  void delete(T object) throws NotFoundException;
+  void delete(T object);
 
   /**
    * Modifies a persistent object.
    *
    *
    * @param object to modify
-   *
-   * @throws IOException
    */
-  void modify(T object) throws NotFoundException;
+  void modify(T object);
 }
diff --git a/scm-core/src/main/java/sonia/scm/Manager.java b/scm-core/src/main/java/sonia/scm/Manager.java
index 20b3a16a8e..390777958d 100644
--- a/scm-core/src/main/java/sonia/scm/Manager.java
+++ b/scm-core/src/main/java/sonia/scm/Manager.java
@@ -58,7 +58,7 @@ public interface Manager<T extends ModelObject>
    *
    * @throws NotFoundException
    */
-  void refresh(T object) throws NotFoundException;
+  void refresh(T object);
 
   //~--- get methods ----------------------------------------------------------
 
diff --git a/scm-core/src/main/java/sonia/scm/ManagerDecorator.java b/scm-core/src/main/java/sonia/scm/ManagerDecorator.java
index ef20a374cb..f6e91aeced 100644
--- a/scm-core/src/main/java/sonia/scm/ManagerDecorator.java
+++ b/scm-core/src/main/java/sonia/scm/ManagerDecorator.java
@@ -66,7 +66,7 @@ public class ManagerDecorator<T extends ModelObject> implements Manager<T> {
   }
 
   @Override
-  public T create(T object) throws AlreadyExistsException {
+  public T create(T object) {
     return decorated.create(object);
   }
 
diff --git a/scm-core/src/main/java/sonia/scm/NotFoundException.java b/scm-core/src/main/java/sonia/scm/NotFoundException.java
index 36b4d37cb1..110402043d 100644
--- a/scm-core/src/main/java/sonia/scm/NotFoundException.java
+++ b/scm-core/src/main/java/sonia/scm/NotFoundException.java
@@ -10,7 +10,7 @@ import java.util.List;
 import static java.util.Collections.unmodifiableList;
 import static java.util.stream.Collectors.joining;
 
-public class NotFoundException extends RuntimeException {
+public class NotFoundException extends RuntimeException implements ExceptionWithContext {
 
   private final List<ContextEntry> context;
 
@@ -22,27 +22,15 @@ public class NotFoundException extends RuntimeException {
     this(Collections.singletonList(new ContextEntry(type, id)));
   }
 
+  public static NotFoundException notFound(ContextEntry.ContextBuilder contextBuilder) {
+    return new NotFoundException(contextBuilder.build());
+  }
+
   private NotFoundException(List<ContextEntry> context) {
     super(createMessage(context));
     this.context = context;
   }
 
-  public static NotFoundExceptionBuilder notFound(Repository repository) {
-    return new NotFoundExceptionBuilder().in(repository);
-  }
-
-  public static NotFoundExceptionBuilder notFound(NamespaceAndName namespaceAndName) {
-    return new NotFoundExceptionBuilder().in(namespaceAndName);
-  }
-
-  public static NotFoundExceptionBuilder notFound(Class type, String id) {
-    return new NotFoundExceptionBuilder().in(type, id);
-  }
-
-  public static NotFoundExceptionBuilder notFound(String type, String id) {
-    return new NotFoundExceptionBuilder().in(type, id);
-  }
-
   public List<ContextEntry> getContext() {
     return unmodifiableList(context);
   }
@@ -52,31 +40,4 @@ public class NotFoundException extends RuntimeException {
       .map(c -> c.getType().toLowerCase() + " with id " + c.getId())
       .collect(joining(" in ", "could not find ", ""));
   }
-
-  public static class NotFoundExceptionBuilder {
-    private final List<ContextEntry> context = new LinkedList<>();
-
-    public NotFoundExceptionBuilder in(Repository repository) {
-      return in(repository.getNamespaceAndName());
-    }
-
-    public NotFoundExceptionBuilder in(NamespaceAndName namespaceAndName) {
-      return this.in(Repository.class, namespaceAndName.logString());
-    }
-
-    public NotFoundExceptionBuilder in(Class type, String id) {
-      context.add(new ContextEntry(type, id));
-      return this;
-    }
-
-    public NotFoundExceptionBuilder in(String type, String id) {
-      context.add(new ContextEntry(type, id));
-      return this;
-    }
-
-    public NotFoundException build() {
-      return new NotFoundException(context);
-    }
-  }
-
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
index 2195e87730..f4438807c6 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
@@ -37,7 +37,6 @@ package sonia.scm.repository;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.AlreadyExistsException;
 import sonia.scm.repository.ImportResult.Builder;
 
 import java.io.File;
@@ -243,7 +242,7 @@ public abstract class AbstactImportHandler implements AdvancedImportHandler
    */
   private void importRepository(RepositoryManager manager,
     String repositoryName)
-    throws IOException, AlreadyExistsException {
+    throws IOException {
     Repository repository =
       createRepository(getRepositoryDirectory(repositoryName), repositoryName);
 
diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
index a717cdf05b..997413aacb 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
@@ -81,11 +81,11 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
   }
 
   @Override
-  public Repository create(Repository repository) throws AlreadyExistsException {
+  public Repository create(Repository repository) {
     File directory = getDirectory(repository);
 
     if (directory.exists()) {
-      throw new AlreadyExistsException();
+      throw new AlreadyExistsException(repository);
     }
 
     checkPath(directory);
@@ -201,7 +201,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
   }
 
   protected void create(Repository repository, File directory)
-    throws IOException, AlreadyExistsException {
+    throws IOException {
     ExtendedCommand cmd = buildCreateCommand(repository, directory);
     CommandResult result = cmd.execute();
 
@@ -256,9 +256,9 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
    * Check path for existing repositories
    *
    * @param directory repository target directory
-   * @throws AlreadyExistsException
+   * @throws RuntimeException when the parent directory already is a repository
    */
-  private void checkPath(File directory) throws AlreadyExistsException {
+  private void checkPath(File directory) {
     File repositoryDirectory = config.getRepositoryDirectory();
     File parent = directory.getParentFile();
 
@@ -266,9 +266,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
       logger.trace("check {} for existing repository", parent);
 
       if (isRepository(parent)) {
-        logger.error("parent path {} is a repository", parent);
-
-        throw new AlreadyExistsException();
+        throw new RuntimeException("parent path " + parent + " is a repository");
       }
 
       parent = parent.getParentFile();
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
index 1e2fdccf42..7f4880c258 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
@@ -35,7 +35,6 @@ package sonia.scm.repository;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.AlreadyExistsException;
 import sonia.scm.TypeManager;
 
 import java.io.IOException;
@@ -73,7 +72,7 @@ public interface RepositoryManager
    *
    * @throws IOException
    */
-  public void importRepository(Repository repository) throws IOException, AlreadyExistsException;
+  public void importRepository(Repository repository) throws IOException;
 
   //~--- get methods ----------------------------------------------------------
 
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java
index 87df960da7..b7a819e5f9 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java
@@ -35,7 +35,6 @@ package sonia.scm.repository;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.AlreadyExistsException;
 import sonia.scm.ManagerDecorator;
 import sonia.scm.Type;
 
@@ -82,7 +81,7 @@ public class RepositoryManagerDecorator
    * {@inheritDoc}
    */
   @Override
-  public void importRepository(Repository repository) throws IOException, AlreadyExistsException {
+  public void importRepository(Repository repository) throws IOException {
     decorated.importRepository(repository);
   }
 
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/BrowseCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/BrowseCommandBuilder.java
index e308be6da4..d482c04ea4 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/BrowseCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/BrowseCommandBuilder.java
@@ -38,7 +38,6 @@ package sonia.scm.repository.api;
 import com.google.common.base.Objects;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.NotFoundException;
 import sonia.scm.cache.Cache;
 import sonia.scm.cache.CacheManager;
 import sonia.scm.repository.BrowserResult;
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
index 4a53dbb449..d57a965a38 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
@@ -64,6 +64,9 @@ import sonia.scm.security.ScmSecurityException;
 
 import java.util.Set;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
+
 //~--- JDK imports ------------------------------------------------------------
 
 /**
@@ -177,7 +180,7 @@ public final class RepositoryServiceFactory
 
     if (repository == null)
     {
-      throw NotFoundException.notFound(namespaceAndName).build();
+      throw notFound(entity(namespaceAndName));
     }
 
     return create(repository);
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/BrowseCommand.java b/scm-core/src/main/java/sonia/scm/repository/spi/BrowseCommand.java
index 69d7080018..ee37d6243e 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/BrowseCommand.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/BrowseCommand.java
@@ -35,7 +35,6 @@ package sonia.scm.repository.spi;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.NotFoundException;
 import sonia.scm.repository.BrowserResult;
 
 import java.io.IOException;
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/HookEventFacade.java b/scm-core/src/main/java/sonia/scm/repository/spi/HookEventFacade.java
index 359b068655..4bbe61ea41 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/HookEventFacade.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/HookEventFacade.java
@@ -35,7 +35,6 @@ package sonia.scm.repository.spi;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryHookEvent;
@@ -44,6 +43,9 @@ import sonia.scm.repository.RepositoryManager;
 import sonia.scm.repository.api.HookContext;
 import sonia.scm.repository.api.HookContextFactory;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
+
 /**
  *
  * @author Sebastian Sdorra
@@ -82,7 +84,7 @@ public final class HookEventFacade
   public HookEventHandler handle(Repository repository) {
     if (repository == null)
     {
-      throw NotFoundException.notFound(repository).build();
+      throw notFound(entity(repository));
     }
 
     return new HookEventHandler(repositoryManagerProvider.get(),
diff --git a/scm-core/src/test/java/sonia/scm/security/SyncingRealmHelperTest.java b/scm-core/src/test/java/sonia/scm/security/SyncingRealmHelperTest.java
index 93b0752766..50bde53ae1 100644
--- a/scm-core/src/test/java/sonia/scm/security/SyncingRealmHelperTest.java
+++ b/scm-core/src/test/java/sonia/scm/security/SyncingRealmHelperTest.java
@@ -43,7 +43,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.AlreadyExistsException;
-import sonia.scm.NotFoundException;
 import sonia.scm.group.Group;
 import sonia.scm.group.GroupManager;
 import sonia.scm.group.GroupNames;
@@ -132,7 +131,7 @@ public class SyncingRealmHelperTest {
    * @throws IOException
    */
   @Test
-  public void testStoreGroupCreate() throws AlreadyExistsException {
+  public void testStoreGroupCreate() {
     Group group = new Group("unit-test", "heartOfGold");
 
     helper.store(group);
@@ -143,7 +142,7 @@ public class SyncingRealmHelperTest {
    * Tests {@link SyncingRealmHelper#store(Group)}.
    */
   @Test(expected = IllegalStateException.class)
-  public void testStoreGroupFailure() throws AlreadyExistsException {
+  public void testStoreGroupFailure() {
     Group group = new Group("unit-test", "heartOfGold");
 
     doThrow(AlreadyExistsException.class).when(groupManager).create(group);
@@ -169,7 +168,7 @@ public class SyncingRealmHelperTest {
    * @throws IOException
    */
   @Test
-  public void testStoreUserCreate() throws AlreadyExistsException {
+  public void testStoreUserCreate() {
     User user = new User("tricia");
 
     helper.store(user);
@@ -180,7 +179,7 @@ public class SyncingRealmHelperTest {
    * Tests {@link SyncingRealmHelper#store(User)} with a thrown {@link AlreadyExistsException}.
    */
   @Test(expected = IllegalStateException.class)
-  public void testStoreUserFailure() throws AlreadyExistsException {
+  public void testStoreUserFailure() {
     User user = new User("tricia");
 
     doThrow(AlreadyExistsException.class).when(userManager).create(user);
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
index 6839ff405c..9186572858 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
@@ -307,7 +307,7 @@ public class GitBrowseCommand extends AbstractGitCommand
     return Strings.isNullOrEmpty(request.getPath()) || "/".equals(request.getPath());
   }
 
-  private FileObject findChildren(FileObject parent, org.eclipse.jgit.lib.Repository repo, BrowseCommandRequest request, ObjectId revId, TreeWalk treeWalk) throws IOException, NotFoundException {
+  private FileObject findChildren(FileObject parent, org.eclipse.jgit.lib.Repository repo, BrowseCommandRequest request, ObjectId revId, TreeWalk treeWalk) throws IOException {
     List<FileObject> files = Lists.newArrayList();
     while (treeWalk.next())
     {
@@ -335,7 +335,7 @@ public class GitBrowseCommand extends AbstractGitCommand
   }
 
   private FileObject findFirstMatch(org.eclipse.jgit.lib.Repository repo,
-                        BrowseCommandRequest request, ObjectId revId, TreeWalk treeWalk) throws IOException, NotFoundException {
+                        BrowseCommandRequest request, ObjectId revId, TreeWalk treeWalk) throws IOException {
     String[] pathElements = request.getPath().split("/");
     int currentDepth = 0;
     int limit = pathElements.length;
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitCatCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitCatCommand.java
index 40f044ebde..7477e0aee3 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitCatCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitCatCommand.java
@@ -44,7 +44,6 @@ import org.eclipse.jgit.treewalk.TreeWalk;
 import org.eclipse.jgit.treewalk.filter.PathFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.NotFoundException;
 import sonia.scm.repository.GitUtil;
 import sonia.scm.util.Util;
 
@@ -54,6 +53,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
+
 
 public class GitCatCommand extends AbstractGitCommand implements CatCommand {
 
@@ -101,7 +103,7 @@ public class GitCatCommand extends AbstractGitCommand implements CatCommand {
     try {
       entry = revWalk.parseCommit(revId);
     } catch (MissingObjectException e) {
-      throw NotFoundException.notFound("Revision", revId.getName()).in(repository).build();
+      throw notFound(entity("Revision", revId.getName()).in(repository));
     }
     RevTree revTree = entry.getTree();
 
@@ -119,7 +121,7 @@ public class GitCatCommand extends AbstractGitCommand implements CatCommand {
 
       return new ClosableObjectLoaderContainer(loader, treeWalk, revWalk);
     } else {
-      throw NotFoundException.notFound("Path", path).in("Revision", revId.getName()).in(repository).build();
+      throw notFound(entity("Path", path).in("Revision", revId.getName()).in(repository));
     }
   }
 
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
index 40b25ef75a..8a3745dce7 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
@@ -48,7 +48,6 @@ import org.eclipse.jgit.treewalk.filter.PathFilter;
 import org.eclipse.jgit.treewalk.filter.TreeFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.NotFoundException;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.GitChangesetConverter;
@@ -61,6 +60,9 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
+
 //~--- JDK imports ------------------------------------------------------------
 
 /**
@@ -248,7 +250,7 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
     }
     catch (MissingObjectException e)
     {
-      throw NotFoundException.notFound("Revision", e.getObjectId().getName()).in(repository).build();
+      throw notFound(entity("Revision", e.getObjectId().getName()).in(repository));
     }
     catch (Exception ex)
     {
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
index 22116eff01..5e63adfb70 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
@@ -32,7 +32,6 @@
 package sonia.scm.repository.spi;
 
 import org.junit.Test;
-import sonia.scm.NotFoundException;
 import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.FileObject;
 import sonia.scm.repository.GitConstants;
@@ -63,7 +62,7 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase {
   }
 
   @Test
-  public void testDefaultDefaultBranch() throws IOException, NotFoundException {
+  public void testDefaultDefaultBranch() throws IOException {
     // without default branch, the repository head should be used
     FileObject root = createCommand().getBrowserResult(new BrowseCommandRequest()).getFile();
     assertNotNull(root);
@@ -78,7 +77,7 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase {
   }
 
   @Test
-  public void testExplicitDefaultBranch() throws IOException, NotFoundException {
+  public void testExplicitDefaultBranch() throws IOException {
     repository.setProperty(GitConstants.PROPERTY_DEFAULT_BRANCH, "test-branch");
 
     FileObject root = createCommand().getBrowserResult(new BrowseCommandRequest()).getFile();
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnUtil.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnUtil.java
index deff53eeac..b4be68a51f 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnUtil.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnUtil.java
@@ -49,7 +49,6 @@ import org.tmatesoft.svn.core.internal.util.SVNEncodingUtil;
 import org.tmatesoft.svn.core.internal.util.SVNXMLUtil;
 import org.tmatesoft.svn.core.io.SVNRepository;
 import org.tmatesoft.svn.core.wc.SVNClientManager;
-import sonia.scm.NotFoundException;
 import sonia.scm.util.HttpUtil;
 import sonia.scm.util.Util;
 
@@ -60,6 +59,9 @@ import java.io.PrintWriter;
 import java.util.List;
 import java.util.Map;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
+
 //~--- JDK imports ------------------------------------------------------------
 
 /**
@@ -114,7 +116,7 @@ public final class SvnUtil
       }
       catch (NumberFormatException ex)
       {
-        throw NotFoundException.notFound("Revision", v).in(repository).build();
+        throw notFound(entity("Revision", v).in(repository));
       }
     }
 
@@ -352,7 +354,7 @@ public final class SvnUtil
       }
       catch (NumberFormatException ex)
       {
-        throw NotFoundException.notFound("Revision", revision).in(repository).build();
+        throw notFound(entity("Revision", revision).in(repository));
       }
     }
 
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnCatCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnCatCommand.java
index 93d52ea907..9a5c39af46 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnCatCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnCatCommand.java
@@ -43,7 +43,6 @@ import org.tmatesoft.svn.core.SVNProperties;
 import org.tmatesoft.svn.core.io.SVNRepository;
 import org.tmatesoft.svn.core.wc.SVNClientManager;
 import org.tmatesoft.svn.core.wc.admin.SVNLookClient;
-import sonia.scm.NotFoundException;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.SvnUtil;
@@ -53,6 +52,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
+
 //~--- JDK imports ------------------------------------------------------------
 
 /**
@@ -131,9 +133,9 @@ public class SvnCatCommand extends AbstractSvnCommand implements CatCommand
   private void handleSvnException(CatCommandRequest request, SVNException ex) {
     int svnErrorCode = ex.getErrorMessage().getErrorCode().getCode();
     if (SVNErrorCode.FS_NOT_FOUND.getCode() == svnErrorCode) {
-      throw NotFoundException.notFound("Path", request.getPath()).in("Revision", request.getRevision()).in(repository).build();
+      throw notFound(entity("Path", request.getPath()).in("Revision", request.getRevision()).in(repository));
     } else if (SVNErrorCode.FS_NO_SUCH_REVISION.getCode() == svnErrorCode) {
-      throw NotFoundException.notFound("Revision", request.getRevision()).in(repository).build();
+      throw notFound(entity("Revision", request.getRevision()).in(repository));
     } else {
       throw new InternalRepositoryException("could not get content from revision", ex);
     }
diff --git a/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java b/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java
index 5a1dc605bb..df974ab566 100644
--- a/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java
+++ b/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java
@@ -71,10 +71,10 @@ public class DummyRepositoryHandler
 
 
   @Override
-  protected void create(Repository repository, File directory) throws AlreadyExistsException {
+  protected void create(Repository repository, File directory) {
     String key = repository.getNamespace() + "/" + repository.getName();
     if (existingRepoNames.contains(key)) {
-      throw new AlreadyExistsException();
+      throw new AlreadyExistsException(repository);
     } else {
       existingRepoNames.add(key);
     }
diff --git a/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java b/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
index 999ef1dc45..d9985d3332 100644
--- a/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
+++ b/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
@@ -35,7 +35,6 @@ package sonia.scm.repository;
 
 import org.junit.Test;
 import sonia.scm.AbstractTestBase;
-import sonia.scm.AlreadyExistsException;
 import sonia.scm.store.ConfigurationStoreFactory;
 import sonia.scm.store.InMemoryConfigurationStoreFactory;
 import sonia.scm.util.IOUtil;
@@ -61,12 +60,12 @@ public abstract class SimpleRepositoryHandlerTestBase extends AbstractTestBase {
     ConfigurationStoreFactory factory, File directory);
 
   @Test
-  public void testCreate() throws AlreadyExistsException {
+  public void testCreate() {
     createRepository();
   }
 
   @Test
-  public void testCreateResourcePath() throws AlreadyExistsException {
+  public void testCreateResourcePath() {
     Repository repository = createRepository();
     String path = handler.createResourcePath(repository);
 
@@ -76,7 +75,7 @@ public abstract class SimpleRepositoryHandlerTestBase extends AbstractTestBase {
   }
 
   @Test
-  public void testDelete() throws Exception {
+  public void testDelete() {
     Repository repository = createRepository();
 
     handler.delete(repository);
@@ -101,7 +100,7 @@ public abstract class SimpleRepositoryHandlerTestBase extends AbstractTestBase {
     }
   }
 
-  private Repository createRepository() throws AlreadyExistsException {
+  private Repository createRepository() {
     Repository repository = RepositoryTestData.createHeartOfGold();
 
     handler.create(repository);
diff --git a/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java b/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
index 9fe8669fc9..3c684f58c9 100644
--- a/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
+++ b/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java
@@ -39,12 +39,10 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.junit.Test;
 import sonia.scm.AlreadyExistsException;
-import sonia.scm.ConcurrentModificationException;
 import sonia.scm.Manager;
 import sonia.scm.ManagerTestBase;
 import sonia.scm.NotFoundException;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -63,7 +61,7 @@ public abstract class UserManagerTestBase extends ManagerTestBase<User> {
   public static final int THREAD_COUNT = 10;
 
   @Test
-  public void testCreate() throws AlreadyExistsException {
+  public void testCreate() {
     User zaphod = UserTestData.createZaphod();
 
     manager.create(zaphod);
@@ -75,7 +73,7 @@ public abstract class UserManagerTestBase extends ManagerTestBase<User> {
   }
 
   @Test(expected = AlreadyExistsException.class)
-  public void testCreateExisting() throws AlreadyExistsException {
+  public void testCreateExisting() {
     User zaphod = UserTestData.createZaphod();
 
     manager.create(zaphod);
@@ -87,7 +85,7 @@ public abstract class UserManagerTestBase extends ManagerTestBase<User> {
   }
 
   @Test
-  public void testDelete() throws Exception {
+  public void testDelete() {
     User zaphod = UserTestData.createZaphod();
 
     manager.create(zaphod);
@@ -102,7 +100,7 @@ public abstract class UserManagerTestBase extends ManagerTestBase<User> {
   }
 
   @Test
-  public void testGet() throws AlreadyExistsException {
+  public void testGet() {
     User zaphod = UserTestData.createZaphod();
 
     manager.create(zaphod);
@@ -116,7 +114,7 @@ public abstract class UserManagerTestBase extends ManagerTestBase<User> {
   }
 
   @Test
-  public void testGetAll() throws AlreadyExistsException {
+  public void testGetAll() {
     User zaphod = UserTestData.createZaphod();
 
     manager.create(zaphod);
@@ -181,7 +179,7 @@ public abstract class UserManagerTestBase extends ManagerTestBase<User> {
   }
 
   @Test
-  public void testModify() throws AlreadyExistsException {
+  public void testModify() {
     User zaphod = UserTestData.createZaphod();
 
     manager.create(zaphod);
@@ -238,7 +236,7 @@ public abstract class UserManagerTestBase extends ManagerTestBase<User> {
   }
 
   @Test
-  public void testRefresh() throws AlreadyExistsException {
+  public void testRefresh() {
     User zaphod = UserTestData.createZaphod();
 
     manager.create(zaphod);
@@ -289,7 +287,7 @@ public abstract class UserManagerTestBase extends ManagerTestBase<User> {
       finished = true;
     }
 
-    private User createUser() throws AlreadyExistsException {
+    private User createUser() {
       String id = UUID.randomUUID().toString();
       User user = new User(id, id.concat(" displayName"),
                     id.concat("@mail.com"));
diff --git a/scm-webapp/src/main/java/sonia/scm/ManagerDaoAdapter.java b/scm-webapp/src/main/java/sonia/scm/ManagerDaoAdapter.java
index 4fdd74063e..fb5cd9f5cc 100644
--- a/scm-webapp/src/main/java/sonia/scm/ManagerDaoAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/ManagerDaoAdapter.java
@@ -34,15 +34,15 @@ public class ManagerDaoAdapter<T extends ModelObject> {
     }
   }
 
-  public T create(T newObject, Supplier<PermissionCheck> permissionCheck, AroundHandler<T> beforeCreate, AroundHandler<T> afterCreate) throws AlreadyExistsException {
+  public T create(T newObject, Supplier<PermissionCheck> permissionCheck, AroundHandler<T> beforeCreate, AroundHandler<T> afterCreate) {
     return create(newObject, permissionCheck, beforeCreate, afterCreate, dao::contains);
   }
 
-  public T create(T newObject, Supplier<PermissionCheck> permissionCheck, AroundHandler<T> beforeCreate, AroundHandler<T> afterCreate, Predicate<T> existsCheck) throws AlreadyExistsException {
+  public T create(T newObject, Supplier<PermissionCheck> permissionCheck, AroundHandler<T> beforeCreate, AroundHandler<T> afterCreate, Predicate<T> existsCheck) {
     permissionCheck.get().check();
     AssertUtil.assertIsValid(newObject);
     if (existsCheck.test(newObject)) {
-      throw new AlreadyExistsException();
+      throw new AlreadyExistsException(newObject);
     }
     newObject.setCreationDate(System.currentTimeMillis());
     beforeCreate.handle(newObject);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/AlreadyExistsExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/AlreadyExistsExceptionMapper.java
index 13d341e1e6..f923eef693 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/AlreadyExistsExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/AlreadyExistsExceptionMapper.java
@@ -1,6 +1,8 @@
 package sonia.scm.api.rest;
 
 import sonia.scm.AlreadyExistsException;
+import sonia.scm.api.v2.resources.ErrorDto;
+import sonia.scm.web.VndMediaType;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
@@ -12,7 +14,8 @@ public class AlreadyExistsExceptionMapper implements ExceptionMapper<AlreadyExis
   @Override
   public Response toResponse(AlreadyExistsException exception) {
     return Response.status(Status.CONFLICT)
-      .entity(exception.getMessage())
+      .entity(ErrorDto.from(exception))
+      .type(VndMediaType.ERROR_TYPE)
       .build();
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java
index 6592bfab8b..828cbf8164 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java
@@ -44,8 +44,6 @@ import org.apache.shiro.authc.credential.PasswordService;
 import org.apache.shiro.subject.Subject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.ConcurrentModificationException;
-import sonia.scm.NotFoundException;
 import sonia.scm.api.rest.RestActionResult;
 import sonia.scm.security.Role;
 import sonia.scm.security.ScmSecurityException;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
index 6bd20688d6..178756f0f9 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
@@ -45,7 +45,6 @@ import com.webcohesion.enunciate.metadata.rs.TypeHint;
 import org.apache.shiro.SecurityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.AlreadyExistsException;
 import sonia.scm.NotFoundException;
 import sonia.scm.NotSupportedFeatuerException;
 import sonia.scm.Type;
@@ -516,13 +515,6 @@ public class RepositoryImportResource
 //      repository = new Repository(null, type, name);
       manager.create(repository);
     }
-    catch (AlreadyExistsException ex)
-    {
-      logger.warn("a {} repository with the name {} already exists", type,
-        name);
-
-      throw new WebApplicationException(Response.Status.CONFLICT);
-    }
     catch (InternalRepositoryException ex)
     {
       handleGenericCreationFailure(ex, type, name);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/NotFoundExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/NotFoundExceptionMapper.java
similarity index 96%
rename from scm-webapp/src/main/java/sonia/scm/api/v2/resources/NotFoundExceptionMapper.java
rename to scm-webapp/src/main/java/sonia/scm/api/v2/NotFoundExceptionMapper.java
index 05c5eccec3..c1f046620a 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/NotFoundExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/NotFoundExceptionMapper.java
@@ -28,13 +28,13 @@
  */
 
 
-package sonia.scm.api.v2.resources;
+package sonia.scm.api.v2;
 
 
 import sonia.scm.NotFoundException;
+import sonia.scm.api.v2.resources.ErrorDto;
 import sonia.scm.web.VndMediaType;
 
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java
index 2c0338309c..71b1127ad8 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java
@@ -27,6 +27,9 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
+
 public class BranchRootResource {
 
   private final RepositoryServiceFactory serviceFactory;
@@ -105,7 +108,7 @@ public class BranchRootResource {
         .stream()
         .anyMatch(branch -> branchName.equals(branch.getName()));
       if (!branchExists){
-        throw NotFoundException.notFound(Branch.class, branchName).in(Repository.class, namespace + "/" + name).build();
+        throw notFound(entity(Branch.class, branchName).in(Repository.class, namespace + "/" + name));
       }
       Repository repository = repositoryService.getRepository();
       RepositoryPermissions.read(repository).check();
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionResourceManagerAdapter.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionResourceManagerAdapter.java
index 3ef19f7294..052bf771b1 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionResourceManagerAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionResourceManagerAdapter.java
@@ -1,7 +1,6 @@
 package sonia.scm.api.v2.resources;
 
 import de.otto.edison.hal.HalRepresentation;
-import sonia.scm.AlreadyExistsException;
 import sonia.scm.Manager;
 import sonia.scm.ModelObject;
 import sonia.scm.PageResult;
@@ -47,7 +46,7 @@ class CollectionResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
    * Creates a model object for the given dto and returns a corresponding http response.
    * This handles all corner cases, eg. no conflicts or missing privileges.
    */
-  public Response create(DTO dto, Supplier<MODEL_OBJECT> modelObjectSupplier, Function<MODEL_OBJECT, String> uriCreator) throws AlreadyExistsException {
+  public Response create(DTO dto, Supplier<MODEL_OBJECT> modelObjectSupplier, Function<MODEL_OBJECT, String> uriCreator) {
     if (dto == null) {
       return Response.status(BAD_REQUEST).build();
     }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
index 3b43c37c5a..a047aece38 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
@@ -3,9 +3,8 @@ package sonia.scm.api.v2.resources;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
 import org.slf4j.MDC;
-import sonia.scm.ConcurrentModificationException;
 import sonia.scm.ContextEntry;
-import sonia.scm.NotFoundException;
+import sonia.scm.ExceptionWithContext;
 
 import java.util.List;
 
@@ -30,11 +29,7 @@ public class ErrorDto {
     this.url = url;
   }
 
-  static ErrorDto from(NotFoundException notFoundException) {
-    return new ErrorDto(MDC.get("transaction_id"), "todo", notFoundException.getContext(), notFoundException.getMessage());
-  }
-
-  public static ErrorDto from(ConcurrentModificationException concurrentModificationException) {
-    return new ErrorDto(MDC.get("transaction_id"), "todo", concurrentModificationException.getContext(), concurrentModificationException.getMessage());
+  public static ErrorDto from(ExceptionWithContext exception) {
+    return new ErrorDto(MDC.get("transaction_id"), "todo", exception.getContext(), exception.getMessage());
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
index 8abab0f720..d845aa181e 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
@@ -5,7 +5,6 @@ import com.webcohesion.enunciate.metadata.rs.ResponseHeader;
 import com.webcohesion.enunciate.metadata.rs.ResponseHeaders;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
-import sonia.scm.AlreadyExistsException;
 import sonia.scm.group.Group;
 import sonia.scm.group.GroupManager;
 import sonia.scm.web.VndMediaType;
@@ -86,7 +85,7 @@ public class GroupCollectionResource {
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   @ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created group"))
-  public Response create(@Valid GroupDto groupDto) throws AlreadyExistsException {
+  public Response create(@Valid GroupDto groupDto) {
     return adapter.create(groupDto,
                           () -> dtoToGroupMapper.map(groupDto),
                           group -> resourceLinks.group().self(group.getName()));
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java
index 308b40b1a5..f2341262ce 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java
@@ -3,8 +3,6 @@ package sonia.scm.api.v2.resources;
 import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
-import sonia.scm.ConcurrentModificationException;
-import sonia.scm.NotFoundException;
 import sonia.scm.group.Group;
 import sonia.scm.group.GroupManager;
 import sonia.scm.web.VndMediaType;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IdResourceManagerAdapter.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IdResourceManagerAdapter.java
index d2e4bd856a..2b2a4cf0ad 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IdResourceManagerAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IdResourceManagerAdapter.java
@@ -1,8 +1,6 @@
 package sonia.scm.api.v2.resources;
 
 import de.otto.edison.hal.HalRepresentation;
-import sonia.scm.AlreadyExistsException;
-import sonia.scm.ConcurrentModificationException;
 import sonia.scm.Manager;
 import sonia.scm.ModelObject;
 import sonia.scm.NotFoundException;
@@ -51,7 +49,7 @@ class IdResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
     return collectionAdapter.getAll(page, pageSize, sortBy, desc, mapToDto);
   }
 
-  public Response create(DTO dto, Supplier<MODEL_OBJECT> modelObjectSupplier, Function<MODEL_OBJECT, String> uriCreator) throws AlreadyExistsException {
+  public Response create(DTO dto, Supplier<MODEL_OBJECT> modelObjectSupplier, Function<MODEL_OBJECT, String> uriCreator) {
     return collectionAdapter.create(dto, modelObjectSupplier, uriCreator);
   }
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
index 4b088a62a5..c997a706fd 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
@@ -29,6 +29,9 @@ import java.net.URI;
 import java.util.Optional;
 import java.util.function.Predicate;
 
+import static sonia.scm.AlreadyExistsException.alreadyExists;
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
 import static sonia.scm.api.v2.resources.PermissionDto.GROUP_PREFIX;
 
 @Slf4j
@@ -70,7 +73,7 @@ public class PermissionRootResource {
   @TypeHint(TypeHint.NO_CONTENT.class)
   @Consumes(VndMediaType.PERMISSION)
   @Path("")
-  public Response create(@PathParam("namespace") String namespace, @PathParam("name") String name,@Valid PermissionDto permission) throws AlreadyExistsException, NotFoundException {
+  public Response create(@PathParam("namespace") String namespace, @PathParam("name") String name,@Valid PermissionDto permission) {
     log.info("try to add new permission: {}", permission);
     Repository repository = load(namespace, name);
     RepositoryPermissions.permissionWrite(repository).check();
@@ -108,7 +111,7 @@ public class PermissionRootResource {
         .filter(filterPermission(permissionName))
         .map(permission -> modelToDtoMapper.map(permission, repository))
         .findFirst()
-        .orElseThrow(() -> NotFoundException.notFound(Permission.class, namespace).in(Repository.class, namespace + "/" + name).build())
+        .orElseThrow(() -> notFound(entity(Permission.class, namespace).in(Repository.class, namespace + "/" + name)))
     ).build();
   }
 
@@ -157,23 +160,23 @@ public class PermissionRootResource {
   public Response update(@PathParam("namespace") String namespace,
                          @PathParam("name") String name,
                          @PathParam("permission-name") String permissionName,
-                         @Valid PermissionDto permission) throws AlreadyExistsException {
+                         @Valid PermissionDto permission) {
     log.info("try to update the permission with name: {}. the modified permission is: {}", permissionName, permission);
     Repository repository = load(namespace, name);
     RepositoryPermissions.permissionWrite(repository).check();
     String extractedPermissionName = getPermissionName(permissionName);
     if (!isPermissionExist(new PermissionDto(extractedPermissionName, isGroupPermission(permissionName)), repository)) {
-      throw NotFoundException.notFound(Permission.class, namespace).in(Repository.class, namespace + "/" + name).build();
+      throw notFound(entity(Permission.class, namespace).in(Repository.class, namespace + "/" + name));
     }
     permission.setGroupPermission(isGroupPermission(permissionName));
     if (!extractedPermissionName.equals(permission.getName())) {
-      checkPermissionAlreadyExists(permission, repository, "target permission " + permission.getName() + " already exists");
+      checkPermissionAlreadyExists(permission, repository);
     }
     Permission existingPermission = repository.getPermissions()
       .stream()
       .filter(filterPermission(permissionName))
       .findFirst()
-      .orElseThrow(() -> NotFoundException.notFound(Permission.class, namespace).in(Repository.class, namespace + "/" + name).build());
+      .orElseThrow(() -> notFound(entity(Permission.class, namespace).in(Repository.class, namespace + "/" + name)));
     dtoToModelMapper.modify(existingPermission, permission);
     manager.modify(repository);
     log.info("the permission with name: {} is updated.", permissionName);
@@ -241,7 +244,7 @@ public class PermissionRootResource {
   private Repository load(String namespace, String name) {
     NamespaceAndName namespaceAndName = new NamespaceAndName(namespace, name);
     return Optional.ofNullable(manager.get(namespaceAndName))
-      .orElseThrow(() -> NotFoundException.notFound(namespaceAndName).build());
+      .orElseThrow(() -> notFound(entity(namespaceAndName)));
   }
 
   /**
@@ -249,12 +252,11 @@ public class PermissionRootResource {
    *
    * @param permission the searched permission
    * @param repository the repository to be inspected
-   * @param errorMessage error message
    * @throws AlreadyExistsException if the permission already exists in the repository
    */
-  private void checkPermissionAlreadyExists(PermissionDto permission, Repository repository, String errorMessage) throws AlreadyExistsException {
+  private void checkPermissionAlreadyExists(PermissionDto permission, Repository repository) {
     if (isPermissionExist(permission, repository)) {
-      throw new AlreadyExistsException(errorMessage);
+      throw alreadyExists(entity("permission", permission.getName()).in(repository));
     }
   }
 
@@ -263,10 +265,6 @@ public class PermissionRootResource {
       .stream()
       .anyMatch(p -> p.getName().equals(permission.getName()) && p.isGroupPermission() == permission.isGroupPermission());
   }
-
-  private void checkPermissionAlreadyExists(PermissionDto permission, Repository repository) throws AlreadyExistsException {
-    checkPermissionAlreadyExists(permission, repository, "the permission " + permission.getName() + " already exist.");
-  }
 }
 
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
index 9f4858d2f6..665e2131d9 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
@@ -5,7 +5,6 @@ import com.webcohesion.enunciate.metadata.rs.ResponseHeader;
 import com.webcohesion.enunciate.metadata.rs.ResponseHeaders;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
-import sonia.scm.AlreadyExistsException;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryManager;
 import sonia.scm.web.VndMediaType;
@@ -87,7 +86,7 @@ public class RepositoryCollectionResource {
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   @ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created repository"))
-  public Response create(@Valid RepositoryDto repositoryDto) throws AlreadyExistsException {
+  public Response create(@Valid RepositoryDto repositoryDto) {
     return adapter.create(repositoryDto,
       () -> dtoToRepositoryMapper.map(repositoryDto, null),
       repository -> resourceLinks.repository().self(repository.getNamespace(), repository.getName()));
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
index f8b56229b1..141cf64ff6 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
@@ -3,8 +3,6 @@ package sonia.scm.api.v2.resources;
 import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
-import sonia.scm.ConcurrentModificationException;
-import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryIsNotArchivedException;
@@ -26,6 +24,9 @@ import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
+
 public class RepositoryResource {
 
   private final RepositoryToRepositoryDtoMapper repositoryToDtoMapper;
@@ -205,7 +206,7 @@ public class RepositoryResource {
 
   private Supplier<Repository> loadBy(String namespace, String name) {
     NamespaceAndName namespaceAndName = new NamespaceAndName(namespace, name);
-    return () -> Optional.ofNullable(manager.get(namespaceAndName)).orElseThrow(() -> NotFoundException.notFound(namespaceAndName).build());
+    return () -> Optional.ofNullable(manager.get(namespaceAndName)).orElseThrow(() -> notFound(entity(namespaceAndName)));
   }
 
   private Predicate<Repository> nameAndNamespaceStaysTheSame(String namespace, String name) {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
index 963f25eaf6..e61a9f3455 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
@@ -11,7 +11,6 @@ import javax.ws.rs.core.GenericEntity;
 import javax.ws.rs.core.Response;
 import java.util.Collection;
 import java.util.Optional;
-import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java
index 632c428e62..7acd59e3e1 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagRootResource.java
@@ -21,6 +21,9 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
+
 public class TagRootResource {
 
   private final RepositoryServiceFactory serviceFactory;
@@ -91,7 +94,7 @@ public class TagRootResource {
   }
 
   private NotFoundException createNotFoundException(String namespace, String name, String tagName) {
-    return NotFoundException.notFound("Tag", tagName).in("Repository", namespace + "/" + name).build();
+    return notFound(entity("Tag", tagName).in("Repository", namespace + "/" + name));
   }
 
   private Tags getTags(RepositoryService repositoryService) throws IOException {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
index 9b39888104..e7a49bc1fd 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
@@ -6,7 +6,6 @@ import com.webcohesion.enunciate.metadata.rs.ResponseHeaders;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
 import org.apache.shiro.authc.credential.PasswordService;
-import sonia.scm.AlreadyExistsException;
 import sonia.scm.user.User;
 import sonia.scm.user.UserManager;
 import sonia.scm.web.VndMediaType;
@@ -91,7 +90,7 @@ public class UserCollectionResource {
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   @ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created user"))
-  public Response create(@Valid UserDto userDto) throws AlreadyExistsException {
+  public Response create(@Valid UserDto userDto) {
     return adapter.create(userDto, () -> dtoToUserMapper.map(userDto, passwordService.encryptPassword(userDto.getPassword())), user -> resourceLinks.user().self(user.getName()));
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
index c2fbc00453..d0ce8c8a63 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
@@ -4,7 +4,6 @@ import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
 import org.apache.shiro.authc.credential.PasswordService;
-import sonia.scm.ConcurrentModificationException;
 import sonia.scm.user.User;
 import sonia.scm.user.UserManager;
 import sonia.scm.web.VndMediaType;
diff --git a/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java b/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
index 662d9407ca..6bf850f99d 100644
--- a/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
@@ -42,7 +42,6 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.AlreadyExistsException;
 import sonia.scm.HandlerEventType;
 import sonia.scm.ManagerDaoAdapter;
 import sonia.scm.NotFoundException;
@@ -106,7 +105,7 @@ public class DefaultGroupManager extends AbstractGroupManager
   }
 
   @Override
-  public Group create(Group group) throws AlreadyExistsException {
+  public Group create(Group group) {
     String type = group.getType();
     if (Util.isEmpty(type)) {
       group.setType(groupDAO.getType());
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
index dc4767e024..6c903815a7 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
@@ -65,6 +65,9 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
+
 /**
  * Default implementation of {@link RepositoryManager}.
  *
@@ -122,11 +125,11 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
   }
 
   @Override
-  public Repository create(Repository repository) throws AlreadyExistsException {
+  public Repository create(Repository repository) {
     return create(repository, true);
   }
 
-  public Repository create(Repository repository, boolean initRepository) throws AlreadyExistsException {
+  public Repository create(Repository repository, boolean initRepository) {
     repository.setId(keyGenerator.createKey());
     repository.setNamespace(namespaceStrategy.createNamespace(repository));
 
@@ -170,7 +173,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
   }
 
   @Override
-  public void importRepository(Repository repository) throws AlreadyExistsException {
+  public void importRepository(Repository repository) {
     create(repository, false);
   }
 
@@ -207,7 +210,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
     if (fresh != null) {
       fresh.copyProperties(repository);
     } else {
-      throw NotFoundException.notFound(repository).build();
+      throw notFound(entity(repository));
     }
   }
 
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/HealthChecker.java b/scm-webapp/src/main/java/sonia/scm/repository/HealthChecker.java
index 61d488d641..8057db53dc 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/HealthChecker.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/HealthChecker.java
@@ -33,7 +33,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.ConcurrentModificationException;
 import sonia.scm.NotFoundException;
 
 import java.util.Set;
diff --git a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
index 0f2f45ff0b..807024c36b 100644
--- a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
@@ -39,7 +39,6 @@ import com.google.inject.Singleton;
 import org.apache.shiro.SecurityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.AlreadyExistsException;
 import sonia.scm.EagerSingleton;
 import sonia.scm.HandlerEventType;
 import sonia.scm.ManagerDaoAdapter;
@@ -137,7 +136,7 @@ public class DefaultUserManager extends AbstractUserManager
    * @throws IOException
    */
   @Override
-  public User create(User user) throws AlreadyExistsException {
+  public User create(User user) {
     String type = user.getType();
     if (Util.isEmpty(type)) {
       user.setType(userDAO.getType());
diff --git a/scm-webapp/src/main/java/sonia/scm/web/i18n/I18nServlet.java b/scm-webapp/src/main/java/sonia/scm/web/i18n/I18nServlet.java
index f80b90e22a..b074781fec 100644
--- a/scm-webapp/src/main/java/sonia/scm/web/i18n/I18nServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/web/i18n/I18nServlet.java
@@ -30,6 +30,9 @@ import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
+
 
 /**
  * Collect the plugin translations.
@@ -69,7 +72,7 @@ public class I18nServlet extends HttpServlet {
           createdFile.ifPresent(map -> createdJsonFileConsumer.accept(path, map));
           return createdFile.orElse(null);
         }
-      )).orElseThrow(() -> NotFoundException.notFound("jsonprovider", path).build());
+      )).orElseThrow(() -> notFound(entity("jsonprovider", path)));
   }
 
   @VisibleForTesting
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
index 4e1a0f90f1..098ec40c3f 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
@@ -20,6 +20,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
+import sonia.scm.api.v2.NotFoundExceptionMapper;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.NamespaceAndName;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
index e762e5d186..f1a1c3b441 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
@@ -19,6 +19,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.NotFoundException;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
+import sonia.scm.api.v2.NotFoundExceptionMapper;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.api.DiffCommandBuilder;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
index 8a71abb670..7dff9f5ff0 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
@@ -6,6 +6,7 @@ import sonia.scm.api.rest.AlreadyExistsExceptionMapper;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
 import sonia.scm.api.rest.ConcurrentModificationExceptionMapper;
 import sonia.scm.api.rest.IllegalArgumentExceptionMapper;
+import sonia.scm.api.v2.NotFoundExceptionMapper;
 
 public class DispatcherMock {
   public static Dispatcher createDispatcher(Object resource) {
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
index 322995eaa7..2963f5d813 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
@@ -20,6 +20,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.NotFoundException;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
+import sonia.scm.api.v2.NotFoundExceptionMapper;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.InternalRepositoryException;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
index 64942fb84b..0377fe0942 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
@@ -19,6 +19,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
+import sonia.scm.api.v2.NotFoundExceptionMapper;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Modifications;
 import sonia.scm.repository.NamespaceAndName;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
index 635d994763..0487e445c1 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
@@ -164,10 +164,7 @@ public class PermissionRootResourceTest extends RepositoryTestBase {
   @TestFactory
   @DisplayName("test endpoints on missing permissions and user is Admin")
   Stream<DynamicTest> missedPermissionTestFactory() {
-    Repository mockRepository = mock(Repository.class);
-    when(mockRepository.getId()).thenReturn(REPOSITORY_NAME);
-    when(mockRepository.getNamespace()).thenReturn(REPOSITORY_NAMESPACE);
-    when(mockRepository.getName()).thenReturn(REPOSITORY_NAME);
+    Repository mockRepository = new Repository(REPOSITORY_NAME, "git", REPOSITORY_NAMESPACE, REPOSITORY_NAME);
     when(repositoryManager.get(any(NamespaceAndName.class))).thenReturn(mockRepository);
     return createDynamicTestsToAssertResponses(
       requestGETPermission.expectedResponseStatus(404),
@@ -180,10 +177,6 @@ public class PermissionRootResourceTest extends RepositoryTestBase {
   @TestFactory
   @DisplayName("test endpoints on missing permissions and user is not Admin")
   Stream<DynamicTest> missedPermissionUserForbiddenTestFactory() {
-    Repository mockRepository = mock(Repository.class);
-    when(mockRepository.getId()).thenReturn(REPOSITORY_NAME);
-    when(mockRepository.getNamespace()).thenReturn(REPOSITORY_NAMESPACE);
-    when(mockRepository.getName()).thenReturn(REPOSITORY_NAME);
     doThrow(AuthorizationException.class).when(repositoryManager).get(any(NamespaceAndName.class));
     return createDynamicTestsToAssertResponses(
       requestGETPermission.expectedResponseStatus(403),
@@ -413,6 +406,7 @@ public class PermissionRootResourceTest extends RepositoryTestBase {
     when(mockRepository.getId()).thenReturn(REPOSITORY_NAME);
     when(mockRepository.getNamespace()).thenReturn(REPOSITORY_NAMESPACE);
     when(mockRepository.getName()).thenReturn(REPOSITORY_NAME);
+    when(mockRepository.getNamespaceAndName()).thenReturn(new NamespaceAndName(REPOSITORY_NAMESPACE, REPOSITORY_NAME));
     when(repositoryManager.get(any(NamespaceAndName.class))).thenReturn(mockRepository);
     when(subject.isPermitted(userPermission != null ? eq(userPermission) : any(String.class))).thenReturn(true);
     return mockRepository;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
index 5f49f31183..803f2b106c 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
@@ -18,6 +18,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
+import sonia.scm.api.v2.NotFoundExceptionMapper;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.Tag;
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
index 8876903637..2b5aeb7f53 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
@@ -110,7 +110,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
   private String mockedNamespace = "default_namespace";
 
   @Test
-  public void testCreate() throws AlreadyExistsException {
+  public void testCreate() {
     Repository heartOfGold = createTestRepository();
     Repository dbRepo = manager.get(heartOfGold.getId());
 
@@ -122,18 +122,18 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
     username = "unpriv"
   )
   @Test(expected = UnauthorizedException.class)
-  public void testCreateWithoutPrivileges() throws AlreadyExistsException {
+  public void testCreateWithoutPrivileges() {
     createTestRepository();
   }
 
   @Test(expected = AlreadyExistsException.class)
-  public void testCreateExisting() throws AlreadyExistsException {
+  public void testCreateExisting() {
     createTestRepository();
     createTestRepository();
   }
 
   @Test
-  public void testDelete() throws Exception {
+  public void testDelete() {
     delete(manager, createTestRepository());
   }
 
@@ -141,12 +141,12 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
     username = "unpriv"
   )
   @Test(expected = UnauthorizedException.class)
-  public void testDeleteWithoutPrivileges() throws Exception {
+  public void testDeleteWithoutPrivileges() {
     delete(manager, createTestRepository());
   }
 
   @Test(expected = RepositoryIsNotArchivedException.class)
-  public void testDeleteNonArchived() throws Exception {
+  public void testDeleteNonArchived() {
     configuration.setEnableRepositoryArchive(true);
     delete(manager, createTestRepository());
   }
@@ -157,7 +157,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
   }
 
   @Test
-  public void testDeleteWithEnabledArchive() throws Exception {
+  public void testDeleteWithEnabledArchive() {
     Repository repository = createTestRepository();
 
     repository.setArchived(true);
@@ -167,7 +167,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
   }
 
   @Test
-  public void testGet() throws AlreadyExistsException {
+  public void testGet() {
     Repository heartOfGold = createTestRepository();
     String id = heartOfGold.getId();
     String description = heartOfGold.getDescription();
@@ -185,7 +185,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
   @SubjectAware(
     username = "crato"
   )
-  public void testGetWithoutRequiredPrivileges() throws AlreadyExistsException {
+  public void testGetWithoutRequiredPrivileges() {
     Repository heartOfGold = RepositoryTestData.createHeartOfGold();
     manager.create(heartOfGold);
 
@@ -194,7 +194,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
   }
 
   @Test
-  public void testGetAll() throws AlreadyExistsException {
+  public void testGetAll() {
     Repository heartOfGold = createTestRepository();
     Repository happyVerticalPeopleTransporter = createSecondTestRepository();
     boolean foundHeart = false;
@@ -232,7 +232,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
   @Test
   @SuppressWarnings("unchecked")
   @SubjectAware(username = "dent")
-  public void testGetAllWithPermissionsForTwoOrThreeRepos() throws AlreadyExistsException {
+  public void testGetAllWithPermissionsForTwoOrThreeRepos() {
     // mock key generator
     KeyGenerator keyGenerator = mock(KeyGenerator.class);
     Stack<String> keys = new Stack<>();
@@ -273,7 +273,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
   }
 
   @Test
-  public void testEvents() throws Exception {
+  public void testEvents() {
     RepositoryManager repoManager = createRepositoryManager(false);
     repoManager.init(contextProvider);
     TestListener listener = new TestListener();
@@ -304,7 +304,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
   }
 
   @Test
-  public void testModify() throws AlreadyExistsException {
+  public void testModify() {
     Repository heartOfGold = createTestRepository();
 
     heartOfGold.setDescription("prototype ship");
@@ -318,7 +318,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
 
   @Test
   @SubjectAware(username = "crato")
-  public void testModifyWithoutRequiredPermissions() throws AlreadyExistsException, NotFoundException {
+  public void testModifyWithoutRequiredPermissions() {
     Repository heartOfGold = RepositoryTestData.createHeartOfGold();
     manager.create(heartOfGold);
     heartOfGold.setDescription("prototype ship");
@@ -333,7 +333,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
   }
 
   @Test
-  public void testRefresh() throws AlreadyExistsException {
+  public void testRefresh() {
     Repository heartOfGold = createTestRepository();
     String description = heartOfGold.getDescription();
 
@@ -344,7 +344,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
 
   @Test
   @SubjectAware(username = "crato")
-  public void testRefreshWithoutRequiredPermissions() throws AlreadyExistsException, NotFoundException {
+  public void testRefreshWithoutRequiredPermissions() {
     Repository heartOfGold = RepositoryTestData.createHeartOfGold();
     manager.create(heartOfGold);
     heartOfGold.setDescription("prototype ship");
@@ -359,7 +359,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
   }
 
   @Test
-  public void testRepositoryHook() throws AlreadyExistsException {
+  public void testRepositoryHook() {
     CountingReceiveHook hook = new CountingReceiveHook();
     RepositoryManager repoManager = createRepositoryManager(false);
 
@@ -379,7 +379,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
   }
 
   @Test
-  public void testNamespaceSet() throws Exception {
+  public void testNamespaceSet() {
     RepositoryManager repoManager = createRepositoryManager(false);
     Repository repository = spy(createTestRepository());
     repository.setName("Testrepo");
@@ -388,14 +388,14 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
   }
 
   @Test
-  public void shouldSetNamespace() throws AlreadyExistsException {
+  public void shouldSetNamespace() {
     Repository repository = new Repository(null, "hg", null, "scm");
     manager.create(repository);
     assertNotNull(repository.getId());
     assertNotNull(repository.getNamespace());
   }
 
-  private void createUriTestRepositories(RepositoryManager m) throws AlreadyExistsException {
+  private void createUriTestRepositories(RepositoryManager m) {
     mockedNamespace = "namespace";
     createRepository(m, new Repository("1", "hg", "namespace", "scm"));
     createRepository(m, new Repository("2", "hg", "namespace", "scm-test"));
@@ -448,7 +448,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
       keyGenerator, repositoryDAO, handlerSet, namespaceStrategy);
   }
 
-  private void createRepository(RepositoryManager m, Repository repository) throws AlreadyExistsException {
+  private void createRepository(RepositoryManager m, Repository repository) {
     m.create(repository);
   }
 
@@ -471,7 +471,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
     assertEquals(repo.getLastModified(), other.getLastModified());
   }
 
-  private Repository createRepository(Repository repository) throws AlreadyExistsException {
+  private Repository createRepository(Repository repository) {
     manager.create(repository);
     assertNotNull(repository.getId());
     assertNotNull(manager.get(repository.getId()));
@@ -486,12 +486,12 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
     return repository;
   }
 
-  private Repository createSecondTestRepository() throws AlreadyExistsException {
+  private Repository createSecondTestRepository() {
     return createRepository(
       RepositoryTestData.createHappyVerticalPeopleTransporter());
   }
 
-  private Repository createTestRepository() throws AlreadyExistsException {
+  private Repository createTestRepository() {
     return createRepository(RepositoryTestData.createHeartOfGold());
   }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java b/scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java
index df32528e5e..1614bf790a 100644
--- a/scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java
@@ -40,7 +40,6 @@ import com.github.sdorra.shiro.SubjectAware;
 import com.google.common.collect.Lists;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -48,7 +47,6 @@ import org.mockito.ArgumentCaptor;
 import sonia.scm.NotFoundException;
 import sonia.scm.store.JAXBConfigurationStoreFactory;
 import sonia.scm.user.xml.XmlUserDAO;
-import sonia.scm.util.MockUtil;
 
 import static org.mockito.Mockito.*;
 
@@ -57,7 +55,6 @@ import static org.mockito.Mockito.*;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Rule;
-import sonia.scm.store.ConfigurationStoreFactory;
 
 /**
  *

From 3f1f404456d6f6cdc3c7a803c5943955ae045147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 25 Oct 2018 15:37:40 +0200
Subject: [PATCH 026/188] add download view

---
 .../src/buttons/DownloadButton.js             | 25 ++++++++
 .../ui-components/src/buttons/index.js        |  2 +-
 scm-ui/public/locales/en/repos.json           |  6 +-
 .../components/content/DownloadViewer.js      | 58 +++++++++++++------
 .../src/repos/sources/containers/Content.js   |  4 +-
 5 files changed, 74 insertions(+), 21 deletions(-)
 create mode 100644 scm-ui-components/packages/ui-components/src/buttons/DownloadButton.js

diff --git a/scm-ui-components/packages/ui-components/src/buttons/DownloadButton.js b/scm-ui-components/packages/ui-components/src/buttons/DownloadButton.js
new file mode 100644
index 0000000000..3a99dc876b
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/src/buttons/DownloadButton.js
@@ -0,0 +1,25 @@
+//@flow
+import React from "react";
+import Button, { type ButtonProps } from "./Button";
+import type {File} from "@scm-manager/ui-types";
+
+type Props = {
+  displayName: string,
+  url: string
+};
+
+class DownloadButton extends React.Component<Props> {
+  render() {
+    const {displayName, url} = this.props;
+    return (
+      <a className="button is-large is-info" href={url}>
+        <span className="icon is-medium">
+          <i className="fas fa-arrow-circle-down" />
+        </span>
+        <span>{displayName}</span>
+      </a>
+    );
+  }
+}
+
+export default DownloadButton;
diff --git a/scm-ui-components/packages/ui-components/src/buttons/index.js b/scm-ui-components/packages/ui-components/src/buttons/index.js
index d7da320fc2..2e166e1d93 100644
--- a/scm-ui-components/packages/ui-components/src/buttons/index.js
+++ b/scm-ui-components/packages/ui-components/src/buttons/index.js
@@ -7,4 +7,4 @@ export { default as DeleteButton } from "./DeleteButton.js";
 export { default as EditButton } from "./EditButton.js";
 export { default as RemoveEntryOfTableButton } from "./RemoveEntryOfTableButton.js";
 export { default as SubmitButton } from "./SubmitButton.js";
-
+export {default as DownloadButton} from "./DownloadButton.js";
diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json
index 60ee220318..d4fd950c45 100644
--- a/scm-ui/public/locales/en/repos.json
+++ b/scm-ui/public/locales/en/repos.json
@@ -51,7 +51,11 @@
       "name": "Name",
       "length": "Length",
       "lastModified": "Last modified",
-      "description": "Description"
+      "description": "Description",
+      "branch": "Branch"
+    },
+    "content": {
+      "downloadButton": "Download"
     }
   },
   "changesets": {
diff --git a/scm-ui/src/repos/sources/components/content/DownloadViewer.js b/scm-ui/src/repos/sources/components/content/DownloadViewer.js
index 9f5e9cdf75..d9a96fd886 100644
--- a/scm-ui/src/repos/sources/components/content/DownloadViewer.js
+++ b/scm-ui/src/repos/sources/components/content/DownloadViewer.js
@@ -1,28 +1,52 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
+import type { File } from "@scm-manager/ui-types";
+import { DownloadButton, DateFromNow } from "@scm-manager/ui-components";
 
 type Props = {
-  t: string => string
+  t: string => string,
+  file: File,
+  revision: string
 };
 
-type State = {
-  content: string
-};
-
-class DownloadViewer extends React.Component<Props, State> {
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      content: ""
-    };
-  }
-
-  componentDidMount() {}
-
+class DownloadViewer extends React.Component<Props> {
   render() {
-    return "DownloadViewer";
+    const { t, file, revision } = this.props;
+    return (
+      <div>
+        <article className="media">
+          <div className="content media-left">
+            <h4>{file.name}</h4>
+          </div>
+          <div className="media-content" />
+          <div className="media-right">
+            <DownloadButton
+              url={file._links.self.href}
+              displayName={t("sources.content.downloadButton")}
+            />
+          </div>
+        </article>
+        <table className="table">
+          <tbody>
+            <tr>
+              <td>{t("sources.description")}</td>
+              <td>{file.description}</td>
+            </tr>
+            <tr>
+              <td>{t("sources.lastModified")}</td>
+              <td>
+                <DateFromNow date={file.lastModified} />
+              </td>
+            </tr>
+            <tr>
+              <td>{t("sources.branch")}</td>
+              <td>{revision}</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    );
   }
 }
 
diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index d8e536e0e1..9506e637aa 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -68,7 +68,7 @@ class Content extends React.Component<Props, State> {
   }
 
   render() {
-    const { file } = this.props;
+    const { file, revision } = this.props;
     const contentType = this.state.contentType;
     const error = this.state.error;
     const hasError = this.state.hasError;
@@ -87,7 +87,7 @@ class Content extends React.Component<Props, State> {
       return <SourcecodeViewer />;
     }
 
-    return <DownloadViewer file={file}/>;
+    return <DownloadViewer file={file} revision={revision}/>;
   }
 }
 

From 7f0b7c5831d6f75b35792f783d0c3b397fc6b1c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 25 Oct 2018 16:23:43 +0200
Subject: [PATCH 027/188] Add generated error code to exceptions

---
 .../src/main/java/sonia/scm/AlreadyExistsException.java   | 7 +++++++
 .../java/sonia/scm/ConcurrentModificationException.java   | 8 ++++++++
 .../src/main/java/sonia/scm/ExceptionWithContext.java     | 2 ++
 scm-core/src/main/java/sonia/scm/NotFoundException.java   | 7 +++++++
 .../main/java/sonia/scm/api/v2/resources/ErrorDto.java    | 2 +-
 5 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/scm-core/src/main/java/sonia/scm/AlreadyExistsException.java b/scm-core/src/main/java/sonia/scm/AlreadyExistsException.java
index 95fc24ecb2..17863c364c 100644
--- a/scm-core/src/main/java/sonia/scm/AlreadyExistsException.java
+++ b/scm-core/src/main/java/sonia/scm/AlreadyExistsException.java
@@ -8,6 +8,8 @@ import static java.util.stream.Collectors.joining;
 
 public class AlreadyExistsException extends RuntimeException implements ExceptionWithContext {
 
+  private static final String CODE = "FtR7UznKU1";
+
   private final List<ContextEntry> context;
 
   public AlreadyExistsException(ModelObject object) {
@@ -27,6 +29,11 @@ public class AlreadyExistsException extends RuntimeException implements Exceptio
     return unmodifiableList(context);
   }
 
+  @Override
+  public String getCode() {
+    return CODE;
+  }
+
   private static String createMessage(List<ContextEntry> context) {
     return context.stream()
       .map(c -> c.getType().toLowerCase() + " with id " + c.getId())
diff --git a/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java b/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
index 2a3e65781d..6fb8ac2b62 100644
--- a/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
+++ b/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
@@ -7,6 +7,9 @@ import static java.util.Collections.unmodifiableList;
 import static java.util.stream.Collectors.joining;
 
 public class ConcurrentModificationException extends RuntimeException implements ExceptionWithContext {
+
+  private static final String CODE = "2wR7UzpPG1";
+
   private final List<ContextEntry> context;
 
   public ConcurrentModificationException(Class type, String id) {
@@ -26,6 +29,11 @@ public class ConcurrentModificationException extends RuntimeException implements
     return unmodifiableList(context);
   }
 
+  @Override
+  public String getCode() {
+    return CODE;
+  }
+
   private static String createMessage(List<ContextEntry> context) {
     return context.stream()
       .map(c -> c.getType().toLowerCase() + " with id " + c.getId())
diff --git a/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java b/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
index d10411ca9a..93edc1f63b 100644
--- a/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
+++ b/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
@@ -6,4 +6,6 @@ public interface ExceptionWithContext {
   List<ContextEntry> getContext();
 
   String getMessage();
+
+  String getCode();
 }
diff --git a/scm-core/src/main/java/sonia/scm/NotFoundException.java b/scm-core/src/main/java/sonia/scm/NotFoundException.java
index 110402043d..30696c73b6 100644
--- a/scm-core/src/main/java/sonia/scm/NotFoundException.java
+++ b/scm-core/src/main/java/sonia/scm/NotFoundException.java
@@ -12,6 +12,8 @@ import static java.util.stream.Collectors.joining;
 
 public class NotFoundException extends RuntimeException implements ExceptionWithContext {
 
+  private static final String CODE = "AGR7UzkhA1";
+
   private final List<ContextEntry> context;
 
   public NotFoundException(Class type, String id) {
@@ -35,6 +37,11 @@ public class NotFoundException extends RuntimeException implements ExceptionWith
     return unmodifiableList(context);
   }
 
+  @Override
+  public String getCode() {
+    return CODE;
+  }
+
   private static String createMessage(List<ContextEntry> context) {
     return context.stream()
       .map(c -> c.getType().toLowerCase() + " with id " + c.getId())
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
index a047aece38..48aa158451 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
@@ -30,6 +30,6 @@ public class ErrorDto {
   }
 
   public static ErrorDto from(ExceptionWithContext exception) {
-    return new ErrorDto(MDC.get("transaction_id"), "todo", exception.getContext(), exception.getMessage());
+    return new ErrorDto(MDC.get("transaction_id"), exception.getCode(), exception.getContext(), exception.getMessage());
   }
 }

From 56ee0c498f282273242b333fee47676ddc7bf555 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 25 Oct 2018 16:39:19 +0200
Subject: [PATCH 028/188] added system property to inject livereload script for
 plugin development

---
 scm-ui/public/index.mustache                  |  4 ++++
 .../scm/TemplatingPushStateDispatcher.java    |  4 ++++
 .../TemplatingPushStateDispatcherTest.java    | 21 +++++++++++++++++--
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/scm-ui/public/index.mustache b/scm-ui/public/index.mustache
index 802be2ca97..62a40d8e93 100644
--- a/scm-ui/public/index.mustache
+++ b/scm-ui/public/index.mustache
@@ -36,5 +36,9 @@
     </script>
     <script src="{{ contextPath }}/vendor.bundle.js"></script>
     <script src="{{ contextPath }}/scm-ui.bundle.js"></script>
+
+    {{#liveReloadURL}}
+    <script src="{{liveReloadURL}}"></script>
+    {{/liveReloadURL}}
   </body>
 </html>
diff --git a/scm-webapp/src/main/java/sonia/scm/TemplatingPushStateDispatcher.java b/scm-webapp/src/main/java/sonia/scm/TemplatingPushStateDispatcher.java
index 6652975c4a..0888a45dc2 100644
--- a/scm-webapp/src/main/java/sonia/scm/TemplatingPushStateDispatcher.java
+++ b/scm-webapp/src/main/java/sonia/scm/TemplatingPushStateDispatcher.java
@@ -57,5 +57,9 @@ public class TemplatingPushStateDispatcher implements PushStateDispatcher {
       return request.getContextPath();
     }
 
+    public String getLiveReloadURL() {
+      return System.getProperty("livereload.url");
+    }
+
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/TemplatingPushStateDispatcherTest.java b/scm-webapp/src/test/java/sonia/scm/TemplatingPushStateDispatcherTest.java
index 126ba9ac0f..cac14bfcf0 100644
--- a/scm-webapp/src/test/java/sonia/scm/TemplatingPushStateDispatcherTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/TemplatingPushStateDispatcherTest.java
@@ -17,6 +17,7 @@ import java.io.StringWriter;
 import java.io.Writer;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -45,6 +46,23 @@ public class TemplatingPushStateDispatcherTest {
 
   @Test
   public void testDispatch() throws IOException {
+    TemplatingPushStateDispatcher.IndexHtmlModel model = dispatch();
+    assertEquals("/scm", model.getContextPath());
+    assertNull(model.getLiveReloadURL());
+  }
+
+  @Test
+  public void testDispatchWithLiveReloadURL() throws IOException {
+    System.setProperty("livereload.url", "/livereload.js");
+    try {
+      TemplatingPushStateDispatcher.IndexHtmlModel model = dispatch();
+      assertEquals("/livereload.js", model.getLiveReloadURL());
+    } finally {
+      System.clearProperty("livereload.url");
+    }
+  }
+
+  private TemplatingPushStateDispatcher.IndexHtmlModel dispatch() throws IOException {
     when(request.getContextPath()).thenReturn("/scm");
     when(templateEngine.getTemplate(TemplatingPushStateDispatcher.TEMPLATE)).thenReturn(template);
 
@@ -59,8 +77,7 @@ public class TemplatingPushStateDispatcherTest {
 
     verify(template).execute(any(Writer.class), captor.capture());
 
-    TemplatingPushStateDispatcher.IndexHtmlModel model = (TemplatingPushStateDispatcher.IndexHtmlModel) captor.getValue();
-    assertEquals("/scm", model.getContextPath());
+    return (TemplatingPushStateDispatcher.IndexHtmlModel) captor.getValue();
   }
 
 }

From 4104a06661b531835a4cc5e325df7c6a82d4e627 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 26 Oct 2018 08:54:05 +0200
Subject: [PATCH 029/188] use flow typings of ui-components for plugins

---
 scm-plugins/scm-git-plugin/.flowconfig        |    1 +
 .../flow-typed/npm/classnames_v2.x.x.js       |   23 -
 .../flow-typed/npm/jest_v23.x.x.js            | 1108 -----------------
 .../flow-typed/npm/moment_v2.3.x.js           |  331 -----
 .../flow-typed/npm/react-jss_vx.x.x.js        |  137 --
 scm-plugins/scm-hg-plugin/.flowconfig         |    1 +
 .../flow-typed/npm/classnames_v2.x.x.js       |   23 -
 .../flow-typed/npm/jest_v23.x.x.js            | 1108 -----------------
 .../flow-typed/npm/moment_v2.3.x.js           |  331 -----
 .../flow-typed/npm/react-jss_vx.x.x.js        |  137 --
 scm-plugins/scm-svn-plugin/.flowconfig        |    1 +
 .../flow-typed/npm/classnames_v2.x.x.js       |   23 -
 .../flow-typed/npm/jest_v23.x.x.js            | 1108 -----------------
 .../flow-typed/npm/moment_v2.3.x.js           |  331 -----
 .../flow-typed/npm/react-jss_vx.x.x.js        |  137 --
 15 files changed, 3 insertions(+), 4797 deletions(-)
 delete mode 100644 scm-plugins/scm-git-plugin/flow-typed/npm/classnames_v2.x.x.js
 delete mode 100644 scm-plugins/scm-git-plugin/flow-typed/npm/jest_v23.x.x.js
 delete mode 100644 scm-plugins/scm-git-plugin/flow-typed/npm/moment_v2.3.x.js
 delete mode 100644 scm-plugins/scm-git-plugin/flow-typed/npm/react-jss_vx.x.x.js
 delete mode 100644 scm-plugins/scm-hg-plugin/flow-typed/npm/classnames_v2.x.x.js
 delete mode 100644 scm-plugins/scm-hg-plugin/flow-typed/npm/jest_v23.x.x.js
 delete mode 100644 scm-plugins/scm-hg-plugin/flow-typed/npm/moment_v2.3.x.js
 delete mode 100644 scm-plugins/scm-hg-plugin/flow-typed/npm/react-jss_vx.x.x.js
 delete mode 100644 scm-plugins/scm-svn-plugin/flow-typed/npm/classnames_v2.x.x.js
 delete mode 100644 scm-plugins/scm-svn-plugin/flow-typed/npm/jest_v23.x.x.js
 delete mode 100644 scm-plugins/scm-svn-plugin/flow-typed/npm/moment_v2.3.x.js
 delete mode 100644 scm-plugins/scm-svn-plugin/flow-typed/npm/react-jss_vx.x.x.js

diff --git a/scm-plugins/scm-git-plugin/.flowconfig b/scm-plugins/scm-git-plugin/.flowconfig
index 7ede008602..b05e157358 100644
--- a/scm-plugins/scm-git-plugin/.flowconfig
+++ b/scm-plugins/scm-git-plugin/.flowconfig
@@ -4,5 +4,6 @@
 [include]
 
 [libs]
+./node_modules/@scm-manager/ui-components/flow-typed
 
 [options]
diff --git a/scm-plugins/scm-git-plugin/flow-typed/npm/classnames_v2.x.x.js b/scm-plugins/scm-git-plugin/flow-typed/npm/classnames_v2.x.x.js
deleted file mode 100644
index 2307243eeb..0000000000
--- a/scm-plugins/scm-git-plugin/flow-typed/npm/classnames_v2.x.x.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// flow-typed signature: cf86673cc32d185bdab1d2ea90578d37
-// flow-typed version: 614bf49aa8/classnames_v2.x.x/flow_>=v0.25.x
-
-type $npm$classnames$Classes =
-  | string
-  | { [className: string]: * }
-  | false
-  | void
-  | null;
-
-declare module "classnames" {
-  declare module.exports: (
-    ...classes: Array<$npm$classnames$Classes | $npm$classnames$Classes[]>
-  ) => string;
-}
-
-declare module "classnames/bind" {
-  declare module.exports: $Exports<"classnames">;
-}
-
-declare module "classnames/dedupe" {
-  declare module.exports: $Exports<"classnames">;
-}
diff --git a/scm-plugins/scm-git-plugin/flow-typed/npm/jest_v23.x.x.js b/scm-plugins/scm-git-plugin/flow-typed/npm/jest_v23.x.x.js
deleted file mode 100644
index 23b66b07e5..0000000000
--- a/scm-plugins/scm-git-plugin/flow-typed/npm/jest_v23.x.x.js
+++ /dev/null
@@ -1,1108 +0,0 @@
-// flow-typed signature: f5a484315a3dea13d273645306e4076a
-// flow-typed version: 7c5d14b3d4/jest_v23.x.x/flow_>=v0.39.x
-
-type JestMockFn<TArguments: $ReadOnlyArray<*>, TReturn> = {
-  (...args: TArguments): TReturn,
-  /**
-   * An object for introspecting mock calls
-   */
-  mock: {
-    /**
-     * An array that represents all calls that have been made into this mock
-     * function. Each call is represented by an array of arguments that were
-     * passed during the call.
-     */
-    calls: Array<TArguments>,
-    /**
-     * An array that contains all the object instances that have been
-     * instantiated from this mock function.
-     */
-    instances: Array<TReturn>
-  },
-  /**
-   * Resets all information stored in the mockFn.mock.calls and
-   * mockFn.mock.instances arrays. Often this is useful when you want to clean
-   * up a mock's usage data between two assertions.
-   */
-  mockClear(): void,
-  /**
-   * Resets all information stored in the mock. This is useful when you want to
-   * completely restore a mock back to its initial state.
-   */
-  mockReset(): void,
-  /**
-   * Removes the mock and restores the initial implementation. This is useful
-   * when you want to mock functions in certain test cases and restore the
-   * original implementation in others. Beware that mockFn.mockRestore only
-   * works when mock was created with jest.spyOn. Thus you have to take care of
-   * restoration yourself when manually assigning jest.fn().
-   */
-  mockRestore(): void,
-  /**
-   * Accepts a function that should be used as the implementation of the mock.
-   * The mock itself will still record all calls that go into and instances
-   * that come from itself -- the only difference is that the implementation
-   * will also be executed when the mock is called.
-   */
-  mockImplementation(
-    fn: (...args: TArguments) => TReturn
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a function that will be used as an implementation of the mock for
-   * one call to the mocked function. Can be chained so that multiple function
-   * calls produce different results.
-   */
-  mockImplementationOnce(
-    fn: (...args: TArguments) => TReturn
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a string to use in test result output in place of "jest.fn()" to
-   * indicate which mock function is being referenced.
-   */
-  mockName(name: string): JestMockFn<TArguments, TReturn>,
-  /**
-   * Just a simple sugar function for returning `this`
-   */
-  mockReturnThis(): void,
-  /**
-   * Accepts a value that will be returned whenever the mock function is called.
-   */
-  mockReturnValue(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for only returning a value once inside your mock
-   */
-  mockReturnValueOnce(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.resolve(value))
-   */
-  mockResolvedValue(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.resolve(value))
-   */
-  mockResolvedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.reject(value))
-   */
-  mockRejectedValue(value: TReturn): JestMockFn<TArguments, Promise<any>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.reject(value))
-   */
-  mockRejectedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<any>>
-};
-
-type JestAsymmetricEqualityType = {
-  /**
-   * A custom Jasmine equality tester
-   */
-  asymmetricMatch(value: mixed): boolean
-};
-
-type JestCallsType = {
-  allArgs(): mixed,
-  all(): mixed,
-  any(): boolean,
-  count(): number,
-  first(): mixed,
-  mostRecent(): mixed,
-  reset(): void
-};
-
-type JestClockType = {
-  install(): void,
-  mockDate(date: Date): void,
-  tick(milliseconds?: number): void,
-  uninstall(): void
-};
-
-type JestMatcherResult = {
-  message?: string | (() => string),
-  pass: boolean
-};
-
-type JestMatcher = (actual: any, expected: any) => JestMatcherResult;
-
-type JestPromiseType = {
-  /**
-   * Use rejects to unwrap the reason of a rejected promise so any other
-   * matcher can be chained. If the promise is fulfilled the assertion fails.
-   */
-  rejects: JestExpectType,
-  /**
-   * Use resolves to unwrap the value of a fulfilled promise so any other
-   * matcher can be chained. If the promise is rejected the assertion fails.
-   */
-  resolves: JestExpectType
-};
-
-/**
- * Jest allows functions and classes to be used as test names in test() and
- * describe()
- */
-type JestTestName = string | Function;
-
-/**
- *  Plugin: jest-styled-components
- */
-
-type JestStyledComponentsMatcherValue =
-  | string
-  | JestAsymmetricEqualityType
-  | RegExp
-  | typeof undefined;
-
-type JestStyledComponentsMatcherOptions = {
-  media?: string;
-  modifier?: string;
-  supports?: string;
-}
-
-type JestStyledComponentsMatchersType = {
-  toHaveStyleRule(
-    property: string,
-    value: JestStyledComponentsMatcherValue,
-    options?: JestStyledComponentsMatcherOptions
-  ): void,
-};
-
-/**
- *  Plugin: jest-enzyme
- */
-type EnzymeMatchersType = {
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmpty(): void,
-  toBeEmptyRender(): void,
-  toBePresent(): void,
-  toContainReact(element: React$Element<any>): void,
-  toExist(): void,
-  toHaveClassName(className: string): void,
-  toHaveHTML(html: string): void,
-  toHaveProp: ((propKey: string, propValue?: any) => void) & ((props: Object) => void),
-  toHaveRef(refName: string): void,
-  toHaveState: ((stateKey: string, stateValue?: any) => void) & ((state: Object) => void),
-  toHaveStyle: ((styleKey: string, styleValue?: any) => void) & ((style: Object) => void),
-  toHaveTagName(tagName: string): void,
-  toHaveText(text: string): void,
-  toIncludeText(text: string): void,
-  toHaveValue(value: any): void,
-  toMatchElement(element: React$Element<any>): void,
-  toMatchSelector(selector: string): void
-};
-
-// DOM testing library extensions https://github.com/kentcdodds/dom-testing-library#custom-jest-matchers
-type DomTestingLibraryType = {
-  toBeInTheDOM(): void,
-  toHaveTextContent(content: string): void,
-  toHaveAttribute(name: string, expectedValue?: string): void
-};
-
-// Jest JQuery Matchers: https://github.com/unindented/custom-jquery-matchers
-type JestJQueryMatchersType = {
-  toExist(): void,
-  toHaveLength(len: number): void,
-  toHaveId(id: string): void,
-  toHaveClass(className: string): void,
-  toHaveTag(tag: string): void,
-  toHaveAttr(key: string, val?: any): void,
-  toHaveProp(key: string, val?: any): void,
-  toHaveText(text: string | RegExp): void,
-  toHaveData(key: string, val?: any): void,
-  toHaveValue(val: any): void,
-  toHaveCss(css: {[key: string]: any}): void,
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmpty(): void,
-  toBeHidden(): void,
-  toBeSelected(): void,
-  toBeVisible(): void,
-  toBeFocused(): void,
-  toBeInDom(): void,
-  toBeMatchedBy(sel: string): void,
-  toHaveDescendant(sel: string): void,
-  toHaveDescendantWithText(sel: string, text: string | RegExp): void
-};
-
-
-// Jest Extended Matchers: https://github.com/jest-community/jest-extended
-type JestExtendedMatchersType = {
-  /**
-     * Note: Currently unimplemented
-     * Passing assertion
-     *
-     * @param {String} message
-     */
-  //  pass(message: string): void;
-
-    /**
-     * Note: Currently unimplemented
-     * Failing assertion
-     *
-     * @param {String} message
-     */
-  //  fail(message: string): void;
-
-    /**
-     * Use .toBeEmpty when checking if a String '', Array [] or Object {} is empty.
-     */
-    toBeEmpty(): void;
-
-    /**
-     * Use .toBeOneOf when checking if a value is a member of a given Array.
-     * @param {Array.<*>} members
-     */
-    toBeOneOf(members: any[]): void;
-
-    /**
-     * Use `.toBeNil` when checking a value is `null` or `undefined`.
-     */
-    toBeNil(): void;
-
-    /**
-     * Use `.toSatisfy` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean`.
-     * @param {Function} predicate
-     */
-    toSatisfy(predicate: (n: any) => boolean): void;
-
-    /**
-     * Use `.toBeArray` when checking if a value is an `Array`.
-     */
-    toBeArray(): void;
-
-    /**
-     * Use `.toBeArrayOfSize` when checking if a value is an `Array` of size x.
-     * @param {Number} x
-     */
-    toBeArrayOfSize(x: number): void;
-
-    /**
-     * Use `.toIncludeAllMembers` when checking if an `Array` contains all of the same members of a given set.
-     * @param {Array.<*>} members
-     */
-    toIncludeAllMembers(members: any[]): void;
-
-    /**
-     * Use `.toIncludeAnyMembers` when checking if an `Array` contains any of the members of a given set.
-     * @param {Array.<*>} members
-     */
-    toIncludeAnyMembers(members: any[]): void;
-
-    /**
-     * Use `.toSatisfyAll` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean` for all values in an array.
-     * @param {Function} predicate
-     */
-    toSatisfyAll(predicate: (n: any) => boolean): void;
-
-    /**
-     * Use `.toBeBoolean` when checking if a value is a `Boolean`.
-     */
-    toBeBoolean(): void;
-
-    /**
-     * Use `.toBeTrue` when checking a value is equal (===) to `true`.
-     */
-    toBeTrue(): void;
-
-    /**
-     * Use `.toBeFalse` when checking a value is equal (===) to `false`.
-     */
-    toBeFalse(): void;
-
-    /**
-     * Use .toBeDate when checking if a value is a Date.
-     */
-    toBeDate(): void;
-
-    /**
-     * Use `.toBeFunction` when checking if a value is a `Function`.
-     */
-    toBeFunction(): void;
-
-    /**
-     * Use `.toHaveBeenCalledBefore` when checking if a `Mock` was called before another `Mock`.
-     *
-     * Note: Required Jest version >22
-     * Note: Your mock functions will have to be asynchronous to cause the timestamps inside of Jest to occur in a differentJS event loop, otherwise the mock timestamps will all be the same
-     *
-     * @param {Mock} mock
-     */
-    toHaveBeenCalledBefore(mock: JestMockFn<any, any>): void;
-
-    /**
-     * Use `.toBeNumber` when checking if a value is a `Number`.
-     */
-    toBeNumber(): void;
-
-    /**
-     * Use `.toBeNaN` when checking a value is `NaN`.
-     */
-    toBeNaN(): void;
-
-    /**
-     * Use `.toBeFinite` when checking if a value is a `Number`, not `NaN` or `Infinity`.
-     */
-    toBeFinite(): void;
-
-    /**
-     * Use `.toBePositive` when checking if a value is a positive `Number`.
-     */
-    toBePositive(): void;
-
-    /**
-     * Use `.toBeNegative` when checking if a value is a negative `Number`.
-     */
-    toBeNegative(): void;
-
-    /**
-     * Use `.toBeEven` when checking if a value is an even `Number`.
-     */
-    toBeEven(): void;
-
-    /**
-     * Use `.toBeOdd` when checking if a value is an odd `Number`.
-     */
-    toBeOdd(): void;
-
-    /**
-     * Use `.toBeWithin` when checking if a number is in between the given bounds of: start (inclusive) and end (exclusive).
-     *
-     * @param {Number} start
-     * @param {Number} end
-     */
-    toBeWithin(start: number, end: number): void;
-
-    /**
-     * Use `.toBeObject` when checking if a value is an `Object`.
-     */
-    toBeObject(): void;
-
-    /**
-     * Use `.toContainKey` when checking if an object contains the provided key.
-     *
-     * @param {String} key
-     */
-    toContainKey(key: string): void;
-
-    /**
-     * Use `.toContainKeys` when checking if an object has all of the provided keys.
-     *
-     * @param {Array.<String>} keys
-     */
-    toContainKeys(keys: string[]): void;
-
-    /**
-     * Use `.toContainAllKeys` when checking if an object only contains all of the provided keys.
-     *
-     * @param {Array.<String>} keys
-     */
-    toContainAllKeys(keys: string[]): void;
-
-    /**
-     * Use `.toContainAnyKeys` when checking if an object contains at least one of the provided keys.
-     *
-     * @param {Array.<String>} keys
-     */
-    toContainAnyKeys(keys: string[]): void;
-
-    /**
-     * Use `.toContainValue` when checking if an object contains the provided value.
-     *
-     * @param {*} value
-     */
-    toContainValue(value: any): void;
-
-    /**
-     * Use `.toContainValues` when checking if an object contains all of the provided values.
-     *
-     * @param {Array.<*>} values
-     */
-    toContainValues(values: any[]): void;
-
-    /**
-     * Use `.toContainAllValues` when checking if an object only contains all of the provided values.
-     *
-     * @param {Array.<*>} values
-     */
-    toContainAllValues(values: any[]): void;
-
-    /**
-     * Use `.toContainAnyValues` when checking if an object contains at least one of the provided values.
-     *
-     * @param {Array.<*>} values
-     */
-    toContainAnyValues(values: any[]): void;
-
-    /**
-     * Use `.toContainEntry` when checking if an object contains the provided entry.
-     *
-     * @param {Array.<String, String>} entry
-     */
-    toContainEntry(entry: [string, string]): void;
-
-    /**
-     * Use `.toContainEntries` when checking if an object contains all of the provided entries.
-     *
-     * @param {Array.<Array.<String, String>>} entries
-     */
-    toContainEntries(entries: [string, string][]): void;
-
-    /**
-     * Use `.toContainAllEntries` when checking if an object only contains all of the provided entries.
-     *
-     * @param {Array.<Array.<String, String>>} entries
-     */
-    toContainAllEntries(entries: [string, string][]): void;
-
-    /**
-     * Use `.toContainAnyEntries` when checking if an object contains at least one of the provided entries.
-     *
-     * @param {Array.<Array.<String, String>>} entries
-     */
-    toContainAnyEntries(entries: [string, string][]): void;
-
-    /**
-     * Use `.toBeExtensible` when checking if an object is extensible.
-     */
-    toBeExtensible(): void;
-
-    /**
-     * Use `.toBeFrozen` when checking if an object is frozen.
-     */
-    toBeFrozen(): void;
-
-    /**
-     * Use `.toBeSealed` when checking if an object is sealed.
-     */
-    toBeSealed(): void;
-
-    /**
-     * Use `.toBeString` when checking if a value is a `String`.
-     */
-    toBeString(): void;
-
-    /**
-     * Use `.toEqualCaseInsensitive` when checking if a string is equal (===) to another ignoring the casing of both strings.
-     *
-     * @param {String} string
-     */
-    toEqualCaseInsensitive(string: string): void;
-
-    /**
-     * Use `.toStartWith` when checking if a `String` starts with a given `String` prefix.
-     *
-     * @param {String} prefix
-     */
-    toStartWith(prefix: string): void;
-
-    /**
-     * Use `.toEndWith` when checking if a `String` ends with a given `String` suffix.
-     *
-     * @param {String} suffix
-     */
-    toEndWith(suffix: string): void;
-
-    /**
-     * Use `.toInclude` when checking if a `String` includes the given `String` substring.
-     *
-     * @param {String} substring
-     */
-    toInclude(substring: string): void;
-
-    /**
-     * Use `.toIncludeRepeated` when checking if a `String` includes the given `String` substring the correct number of times.
-     *
-     * @param {String} substring
-     * @param {Number} times
-     */
-    toIncludeRepeated(substring: string, times: number): void;
-
-    /**
-     * Use `.toIncludeMultiple` when checking if a `String` includes all of the given substrings.
-     *
-     * @param {Array.<String>} substring
-     */
-    toIncludeMultiple(substring: string[]): void;
-};
-
-interface JestExpectType {
-  not:
-    & JestExpectType
-    & EnzymeMatchersType
-    & DomTestingLibraryType
-    & JestJQueryMatchersType
-    & JestStyledComponentsMatchersType
-    & JestExtendedMatchersType,
-  /**
-   * If you have a mock function, you can use .lastCalledWith to test what
-   * arguments it was last called with.
-   */
-  lastCalledWith(...args: Array<any>): void,
-  /**
-   * toBe just checks that a value is what you expect. It uses === to check
-   * strict equality.
-   */
-  toBe(value: any): void,
-  /**
-   * Use .toBeCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toBeCalledWith(...args: Array<any>): void,
-  /**
-   * Using exact equality with floating point numbers is a bad idea. Rounding
-   * means that intuitive things fail.
-   */
-  toBeCloseTo(num: number, delta: any): void,
-  /**
-   * Use .toBeDefined to check that a variable is not undefined.
-   */
-  toBeDefined(): void,
-  /**
-   * Use .toBeFalsy when you don't care what a value is, you just want to
-   * ensure a value is false in a boolean context.
-   */
-  toBeFalsy(): void,
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThan.
-   */
-  toBeGreaterThan(number: number): void,
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThanOrEqual.
-   */
-  toBeGreaterThanOrEqual(number: number): void,
-  /**
-   * To compare floating point numbers, you can use toBeLessThan.
-   */
-  toBeLessThan(number: number): void,
-  /**
-   * To compare floating point numbers, you can use toBeLessThanOrEqual.
-   */
-  toBeLessThanOrEqual(number: number): void,
-  /**
-   * Use .toBeInstanceOf(Class) to check that an object is an instance of a
-   * class.
-   */
-  toBeInstanceOf(cls: Class<*>): void,
-  /**
-   * .toBeNull() is the same as .toBe(null) but the error messages are a bit
-   * nicer.
-   */
-  toBeNull(): void,
-  /**
-   * Use .toBeTruthy when you don't care what a value is, you just want to
-   * ensure a value is true in a boolean context.
-   */
-  toBeTruthy(): void,
-  /**
-   * Use .toBeUndefined to check that a variable is undefined.
-   */
-  toBeUndefined(): void,
-  /**
-   * Use .toContain when you want to check that an item is in a list. For
-   * testing the items in the list, this uses ===, a strict equality check.
-   */
-  toContain(item: any): void,
-  /**
-   * Use .toContainEqual when you want to check that an item is in a list. For
-   * testing the items in the list, this matcher recursively checks the
-   * equality of all fields, rather than checking for object identity.
-   */
-  toContainEqual(item: any): void,
-  /**
-   * Use .toEqual when you want to check that two objects have the same value.
-   * This matcher recursively checks the equality of all fields, rather than
-   * checking for object identity.
-   */
-  toEqual(value: any): void,
-  /**
-   * Use .toHaveBeenCalled to ensure that a mock function got called.
-   */
-  toHaveBeenCalled(): void,
-  toBeCalled(): void;
-  /**
-   * Use .toHaveBeenCalledTimes to ensure that a mock function got called exact
-   * number of times.
-   */
-  toHaveBeenCalledTimes(number: number): void,
-  toBeCalledTimes(number: number): void;
-  /**
-   *
-   */
-  toHaveBeenNthCalledWith(nthCall: number, ...args: Array<any>): void;
-  nthCalledWith(nthCall: number, ...args: Array<any>): void;
-  /**
-   *
-   */
-  toHaveReturned(): void;
-  toReturn(): void;
-  /**
-   *
-   */
-  toHaveReturnedTimes(number: number): void;
-  toReturnTimes(number: number): void;
-  /**
-   *
-   */
-  toHaveReturnedWith(value: any): void;
-  toReturnWith(value: any): void;
-  /**
-   *
-   */
-  toHaveLastReturnedWith(value: any): void;
-  lastReturnedWith(value: any): void;
-  /**
-   *
-   */
-  toHaveNthReturnedWith(nthCall: number, value: any): void;
-  nthReturnedWith(nthCall: number, value: any): void;
-  /**
-   * Use .toHaveBeenCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toHaveBeenCalledWith(...args: Array<any>): void,
-  toBeCalledWith(...args: Array<any>): void,
-  /**
-   * Use .toHaveBeenLastCalledWith to ensure that a mock function was last called
-   * with specific arguments.
-   */
-  toHaveBeenLastCalledWith(...args: Array<any>): void,
-  lastCalledWith(...args: Array<any>): void,
-  /**
-   * Check that an object has a .length property and it is set to a certain
-   * numeric value.
-   */
-  toHaveLength(number: number): void,
-  /**
-   *
-   */
-  toHaveProperty(propPath: string, value?: any): void,
-  /**
-   * Use .toMatch to check that a string matches a regular expression or string.
-   */
-  toMatch(regexpOrString: RegExp | string): void,
-  /**
-   * Use .toMatchObject to check that a javascript object matches a subset of the properties of an object.
-   */
-  toMatchObject(object: Object | Array<Object>): void,
-  /**
-   * Use .toStrictEqual to check that a javascript object matches a subset of the properties of an object.
-   */
-  toStrictEqual(value: any): void,
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(propertyMatchers?: {[key: string]: JestAsymmetricEqualityType}, name?: string): void,
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(name: string): void,
-
-  toMatchInlineSnapshot(snapshot?: string): void,
-  toMatchInlineSnapshot(propertyMatchers?: {[key: string]: JestAsymmetricEqualityType}, snapshot?: string): void,
-  /**
-   * Use .toThrow to test that a function throws when it is called.
-   * If you want to test that a specific error gets thrown, you can provide an
-   * argument to toThrow. The argument can be a string for the error message,
-   * a class for the error, or a regex that should match the error.
-   *
-   * Alias: .toThrowError
-   */
-  toThrow(message?: string | Error | Class<Error> | RegExp): void,
-  toThrowError(message?: string | Error | Class<Error> | RegExp): void,
-  /**
-   * Use .toThrowErrorMatchingSnapshot to test that a function throws a error
-   * matching the most recent snapshot when it is called.
-   */
-  toThrowErrorMatchingSnapshot(): void,
-  toThrowErrorMatchingInlineSnapshot(snapshot?: string): void,
-}
-
-type JestObjectType = {
-  /**
-   *  Disables automatic mocking in the module loader.
-   *
-   *  After this method is called, all `require()`s will return the real
-   *  versions of each module (rather than a mocked version).
-   */
-  disableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of disableAutomock
-   */
-  autoMockOff(): JestObjectType,
-  /**
-   * Enables automatic mocking in the module loader.
-   */
-  enableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of enableAutomock
-   */
-  autoMockOn(): JestObjectType,
-  /**
-   * Clears the mock.calls and mock.instances properties of all mocks.
-   * Equivalent to calling .mockClear() on every mocked function.
-   */
-  clearAllMocks(): JestObjectType,
-  /**
-   * Resets the state of all mocks. Equivalent to calling .mockReset() on every
-   * mocked function.
-   */
-  resetAllMocks(): JestObjectType,
-  /**
-   * Restores all mocks back to their original value.
-   */
-  restoreAllMocks(): JestObjectType,
-  /**
-   * Removes any pending timers from the timer system.
-   */
-  clearAllTimers(): void,
-  /**
-   * The same as `mock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  doMock(moduleName: string, moduleFactory?: any): JestObjectType,
-  /**
-   * The same as `unmock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  dontMock(moduleName: string): JestObjectType,
-  /**
-   * Returns a new, unused mock function. Optionally takes a mock
-   * implementation.
-   */
-  fn<TArguments: $ReadOnlyArray<*>, TReturn>(
-    implementation?: (...args: TArguments) => TReturn
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Determines if the given function is a mocked function.
-   */
-  isMockFunction(fn: Function): boolean,
-  /**
-   * Given the name of a module, use the automatic mocking system to generate a
-   * mocked version of the module for you.
-   */
-  genMockFromModule(moduleName: string): any,
-  /**
-   * Mocks a module with an auto-mocked version when it is being required.
-   *
-   * The second argument can be used to specify an explicit module factory that
-   * is being run instead of using Jest's automocking feature.
-   *
-   * The third argument can be used to create virtual mocks -- mocks of modules
-   * that don't exist anywhere in the system.
-   */
-  mock(
-    moduleName: string,
-    moduleFactory?: any,
-    options?: Object
-  ): JestObjectType,
-  /**
-   * Returns the actual module instead of a mock, bypassing all checks on
-   * whether the module should receive a mock implementation or not.
-   */
-  requireActual(moduleName: string): any,
-  /**
-   * Returns a mock module instead of the actual module, bypassing all checks
-   * on whether the module should be required normally or not.
-   */
-  requireMock(moduleName: string): any,
-  /**
-   * Resets the module registry - the cache of all required modules. This is
-   * useful to isolate modules where local state might conflict between tests.
-   */
-  resetModules(): JestObjectType,
-  /**
-   * Exhausts the micro-task queue (usually interfaced in node via
-   * process.nextTick).
-   */
-  runAllTicks(): void,
-  /**
-   * Exhausts the macro-task queue (i.e., all tasks queued by setTimeout(),
-   * setInterval(), and setImmediate()).
-   */
-  runAllTimers(): void,
-  /**
-   * Exhausts all tasks queued by setImmediate().
-   */
-  runAllImmediates(): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   */
-  advanceTimersByTime(msToRun: number): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   *
-   * Renamed to `advanceTimersByTime`.
-   */
-  runTimersToTime(msToRun: number): void,
-  /**
-   * Executes only the macro-tasks that are currently pending (i.e., only the
-   * tasks that have been queued by setTimeout() or setInterval() up to this
-   * point)
-   */
-  runOnlyPendingTimers(): void,
-  /**
-   * Explicitly supplies the mock object that the module system should return
-   * for the specified module. Note: It is recommended to use jest.mock()
-   * instead.
-   */
-  setMock(moduleName: string, moduleExports: any): JestObjectType,
-  /**
-   * Indicates that the module system should never return a mocked version of
-   * the specified module from require() (e.g. that it should always return the
-   * real module).
-   */
-  unmock(moduleName: string): JestObjectType,
-  /**
-   * Instructs Jest to use fake versions of the standard timer functions
-   * (setTimeout, setInterval, clearTimeout, clearInterval, nextTick,
-   * setImmediate and clearImmediate).
-   */
-  useFakeTimers(): JestObjectType,
-  /**
-   * Instructs Jest to use the real versions of the standard timer functions.
-   */
-  useRealTimers(): JestObjectType,
-  /**
-   * Creates a mock function similar to jest.fn but also tracks calls to
-   * object[methodName].
-   */
-  spyOn(object: Object, methodName: string, accessType?: "get" | "set"): JestMockFn<any, any>,
-  /**
-   * Set the default timeout interval for tests and before/after hooks in milliseconds.
-   * Note: The default timeout interval is 5 seconds if this method is not called.
-   */
-  setTimeout(timeout: number): JestObjectType
-};
-
-type JestSpyType = {
-  calls: JestCallsType
-};
-
-/** Runs this function after every test inside this context */
-declare function afterEach(
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-/** Runs this function before every test inside this context */
-declare function beforeEach(
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-/** Runs this function after all tests have finished inside this context */
-declare function afterAll(
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-/** Runs this function before any tests have started inside this context */
-declare function beforeAll(
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-
-/** A context for grouping tests together */
-declare var describe: {
-  /**
-   * Creates a block that groups together several related tests in one "test suite"
-   */
-  (name: JestTestName, fn: () => void): void,
-
-  /**
-   * Only run this describe block
-   */
-  only(name: JestTestName, fn: () => void): void,
-
-  /**
-   * Skip running this describe block
-   */
-  skip(name: JestTestName, fn: () => void): void
-};
-
-/** An individual test unit */
-declare var it: {
-  /**
-   * An individual test unit
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  (
-    name: JestTestName,
-    fn?: (done: () => void) => ?Promise<mixed>,
-    timeout?: number
-  ): void,
-  /**
-   * each runs this test against array of argument arrays per each run
-   *
-   * @param {table} table of Test
-   */
-  each(
-    table: Array<Array<mixed>>
-  ): (
-    name: JestTestName,
-    fn?: (...args: Array<any>) => ?Promise<mixed>
-  ) => void,
-  /**
-   * Only run this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  only(
-    name: JestTestName,
-    fn?: (done: () => void) => ?Promise<mixed>,
-    timeout?: number
-  ): {
-    each(
-      table: Array<Array<mixed>>
-    ): (
-      name: JestTestName,
-      fn?: (...args: Array<any>) => ?Promise<mixed>
-    ) => void,
-  },
-  /**
-   * Skip running this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  skip(
-    name: JestTestName,
-    fn?: (done: () => void) => ?Promise<mixed>,
-    timeout?: number
-  ): void,
-  /**
-   * Run the test concurrently
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  concurrent(
-    name: JestTestName,
-    fn?: (done: () => void) => ?Promise<mixed>,
-    timeout?: number
-  ): void
-};
-declare function fit(
-  name: JestTestName,
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-/** An individual test unit */
-declare var test: typeof it;
-/** A disabled group of tests */
-declare var xdescribe: typeof describe;
-/** A focused group of tests */
-declare var fdescribe: typeof describe;
-/** A disabled individual test */
-declare var xit: typeof it;
-/** A disabled individual test */
-declare var xtest: typeof it;
-
-type JestPrettyFormatColors = {
-  comment: { close: string, open: string },
-  content: { close: string, open: string },
-  prop: { close: string, open: string },
-  tag: { close: string, open: string },
-  value: { close: string, open: string },
-};
-
-type JestPrettyFormatIndent = string => string;
-type JestPrettyFormatRefs = Array<any>;
-type JestPrettyFormatPrint = any => string;
-type JestPrettyFormatStringOrNull = string | null;
-
-type JestPrettyFormatOptions = {|
-  callToJSON: boolean,
-  edgeSpacing: string,
-  escapeRegex: boolean,
-  highlight: boolean,
-  indent: number,
-  maxDepth: number,
-  min: boolean,
-  plugins: JestPrettyFormatPlugins,
-  printFunctionName: boolean,
-  spacing: string,
-  theme: {|
-    comment: string,
-    content: string,
-    prop: string,
-    tag: string,
-    value: string,
-  |},
-|};
-
-type JestPrettyFormatPlugin = {
-  print: (
-    val: any,
-    serialize: JestPrettyFormatPrint,
-    indent: JestPrettyFormatIndent,
-    opts: JestPrettyFormatOptions,
-    colors: JestPrettyFormatColors,
-  ) => string,
-  test: any => boolean,
-};
-
-type JestPrettyFormatPlugins = Array<JestPrettyFormatPlugin>;
-
-/** The expect function is used every time you want to test a value */
-declare var expect: {
-  /** The object that you want to make assertions against */
-  (value: any):
-    & JestExpectType
-    & JestPromiseType
-    & EnzymeMatchersType
-    & DomTestingLibraryType
-    & JestJQueryMatchersType
-    & JestStyledComponentsMatchersType
-    & JestExtendedMatchersType,
-
-  /** Add additional Jasmine matchers to Jest's roster */
-  extend(matchers: { [name: string]: JestMatcher }): void,
-  /** Add a module that formats application-specific data structures. */
-  addSnapshotSerializer(pluginModule: JestPrettyFormatPlugin): void,
-  assertions(expectedAssertions: number): void,
-  hasAssertions(): void,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  objectContaining(value: Object): Object,
-  /** Matches any received string that contains the exact expected string. */
-  stringContaining(value: string): string,
-  stringMatching(value: string | RegExp): string,
-  not: {
-    arrayContaining: (value: $ReadOnlyArray<mixed>) => Array<mixed>,
-    objectContaining: (value: {}) => Object,
-    stringContaining: (value: string) => string,
-    stringMatching: (value: string | RegExp) => string,
-  },
-};
-
-// TODO handle return type
-// http://jasmine.github.io/2.4/introduction.html#section-Spies
-declare function spyOn(value: mixed, method: string): Object;
-
-/** Holds all functions related to manipulating test runner */
-declare var jest: JestObjectType;
-
-/**
- * The global Jasmine object, this is generally not exposed as the public API,
- * using features inside here could break in later versions of Jest.
- */
-declare var jasmine: {
-  DEFAULT_TIMEOUT_INTERVAL: number,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  clock(): JestClockType,
-  createSpy(name: string): JestSpyType,
-  createSpyObj(
-    baseName: string,
-    methodNames: Array<string>
-  ): { [methodName: string]: JestSpyType },
-  objectContaining(value: Object): Object,
-  stringMatching(value: string): string
-};
diff --git a/scm-plugins/scm-git-plugin/flow-typed/npm/moment_v2.3.x.js b/scm-plugins/scm-git-plugin/flow-typed/npm/moment_v2.3.x.js
deleted file mode 100644
index c2786e87fd..0000000000
--- a/scm-plugins/scm-git-plugin/flow-typed/npm/moment_v2.3.x.js
+++ /dev/null
@@ -1,331 +0,0 @@
-// flow-typed signature: 23b805356f90ad9384dd88489654e380
-// flow-typed version: e9374c5fe9/moment_v2.3.x/flow_>=v0.25.x
-
-type moment$MomentOptions = {
-  y?: number | string,
-  year?: number | string,
-  years?: number | string,
-  M?: number | string,
-  month?: number | string,
-  months?: number | string,
-  d?: number | string,
-  day?: number | string,
-  days?: number | string,
-  date?: number | string,
-  h?: number | string,
-  hour?: number | string,
-  hours?: number | string,
-  m?: number | string,
-  minute?: number | string,
-  minutes?: number | string,
-  s?: number | string,
-  second?: number | string,
-  seconds?: number | string,
-  ms?: number | string,
-  millisecond?: number | string,
-  milliseconds?: number | string
-};
-
-type moment$MomentObject = {
-  years: number,
-  months: number,
-  date: number,
-  hours: number,
-  minutes: number,
-  seconds: number,
-  milliseconds: number
-};
-
-type moment$MomentCreationData = {
-  input: string,
-  format: string,
-  locale: Object,
-  isUTC: boolean,
-  strict: boolean
-};
-
-type moment$CalendarFormat = string | ((moment: moment$Moment) => string);
-
-type moment$CalendarFormats = {
-  sameDay?: moment$CalendarFormat,
-  nextDay?: moment$CalendarFormat,
-  nextWeek?: moment$CalendarFormat,
-  lastDay?: moment$CalendarFormat,
-  lastWeek?: moment$CalendarFormat,
-  sameElse?: moment$CalendarFormat
-};
-
-declare class moment$LocaleData {
-  months(moment: moment$Moment): string,
-  monthsShort(moment: moment$Moment): string,
-  monthsParse(month: string): number,
-  weekdays(moment: moment$Moment): string,
-  weekdaysShort(moment: moment$Moment): string,
-  weekdaysMin(moment: moment$Moment): string,
-  weekdaysParse(weekDay: string): number,
-  longDateFormat(dateFormat: string): string,
-  isPM(date: string): boolean,
-  meridiem(hours: number, minutes: number, isLower: boolean): string,
-  calendar(
-    key:
-      | "sameDay"
-      | "nextDay"
-      | "lastDay"
-      | "nextWeek"
-      | "prevWeek"
-      | "sameElse",
-    moment: moment$Moment
-  ): string,
-  relativeTime(
-    number: number,
-    withoutSuffix: boolean,
-    key: "s" | "m" | "mm" | "h" | "hh" | "d" | "dd" | "M" | "MM" | "y" | "yy",
-    isFuture: boolean
-  ): string,
-  pastFuture(diff: any, relTime: string): string,
-  ordinal(number: number): string,
-  preparse(str: string): any,
-  postformat(str: string): any,
-  week(moment: moment$Moment): string,
-  invalidDate(): string,
-  firstDayOfWeek(): number,
-  firstDayOfYear(): number
-}
-declare class moment$MomentDuration {
-  humanize(suffix?: boolean): string,
-  milliseconds(): number,
-  asMilliseconds(): number,
-  seconds(): number,
-  asSeconds(): number,
-  minutes(): number,
-  asMinutes(): number,
-  hours(): number,
-  asHours(): number,
-  days(): number,
-  asDays(): number,
-  months(): number,
-  asWeeks(): number,
-  weeks(): number,
-  asMonths(): number,
-  years(): number,
-  asYears(): number,
-  add(value: number | moment$MomentDuration | Object, unit?: string): this,
-  subtract(value: number | moment$MomentDuration | Object, unit?: string): this,
-  as(unit: string): number,
-  get(unit: string): number,
-  toJSON(): string,
-  toISOString(): string,
-  isValid(): boolean
-}
-declare class moment$Moment {
-  static ISO_8601: string,
-  static (
-    string?: string,
-    format?: string | Array<string>,
-    strict?: boolean
-  ): moment$Moment,
-  static (
-    string?: string,
-    format?: string | Array<string>,
-    locale?: string,
-    strict?: boolean
-  ): moment$Moment,
-  static (
-    initDate: ?Object | number | Date | Array<number> | moment$Moment | string
-  ): moment$Moment,
-  static unix(seconds: number): moment$Moment,
-  static utc(): moment$Moment,
-  static utc(number: number | Array<number>): moment$Moment,
-  static utc(
-    str: string,
-    str2?: string | Array<string>,
-    str3?: string
-  ): moment$Moment,
-  static utc(moment: moment$Moment): moment$Moment,
-  static utc(date: Date): moment$Moment,
-  static parseZone(): moment$Moment,
-  static parseZone(rawDate: string): moment$Moment,
-  static parseZone(
-    rawDate: string,
-    format: string | Array<string>
-  ): moment$Moment,
-  static parseZone(
-    rawDate: string,
-    format: string,
-    strict: boolean
-  ): moment$Moment,
-  static parseZone(
-    rawDate: string,
-    format: string,
-    locale: string,
-    strict: boolean
-  ): moment$Moment,
-  isValid(): boolean,
-  invalidAt(): 0 | 1 | 2 | 3 | 4 | 5 | 6,
-  creationData(): moment$MomentCreationData,
-  millisecond(number: number): this,
-  milliseconds(number: number): this,
-  millisecond(): number,
-  milliseconds(): number,
-  second(number: number): this,
-  seconds(number: number): this,
-  second(): number,
-  seconds(): number,
-  minute(number: number): this,
-  minutes(number: number): this,
-  minute(): number,
-  minutes(): number,
-  hour(number: number): this,
-  hours(number: number): this,
-  hour(): number,
-  hours(): number,
-  date(number: number): this,
-  dates(number: number): this,
-  date(): number,
-  dates(): number,
-  day(day: number | string): this,
-  days(day: number | string): this,
-  day(): number,
-  days(): number,
-  weekday(number: number): this,
-  weekday(): number,
-  isoWeekday(number: number): this,
-  isoWeekday(): number,
-  dayOfYear(number: number): this,
-  dayOfYear(): number,
-  week(number: number): this,
-  weeks(number: number): this,
-  week(): number,
-  weeks(): number,
-  isoWeek(number: number): this,
-  isoWeeks(number: number): this,
-  isoWeek(): number,
-  isoWeeks(): number,
-  month(number: number): this,
-  months(number: number): this,
-  month(): number,
-  months(): number,
-  quarter(number: number): this,
-  quarter(): number,
-  year(number: number): this,
-  years(number: number): this,
-  year(): number,
-  years(): number,
-  weekYear(number: number): this,
-  weekYear(): number,
-  isoWeekYear(number: number): this,
-  isoWeekYear(): number,
-  weeksInYear(): number,
-  isoWeeksInYear(): number,
-  get(string: string): number,
-  set(unit: string, value: number): this,
-  set(options: { [unit: string]: number }): this,
-  static max(...dates: Array<moment$Moment>): moment$Moment,
-  static max(dates: Array<moment$Moment>): moment$Moment,
-  static min(...dates: Array<moment$Moment>): moment$Moment,
-  static min(dates: Array<moment$Moment>): moment$Moment,
-  add(
-    value: number | moment$MomentDuration | moment$Moment | Object,
-    unit?: string
-  ): this,
-  subtract(
-    value: number | moment$MomentDuration | moment$Moment | string | Object,
-    unit?: string
-  ): this,
-  startOf(unit: string): this,
-  endOf(unit: string): this,
-  local(): this,
-  utc(): this,
-  utcOffset(
-    offset: number | string,
-    keepLocalTime?: boolean,
-    keepMinutes?: boolean
-  ): this,
-  utcOffset(): number,
-  format(format?: string): string,
-  fromNow(removeSuffix?: boolean): string,
-  from(
-    value: moment$Moment | string | number | Date | Array<number>,
-    removePrefix?: boolean
-  ): string,
-  toNow(removePrefix?: boolean): string,
-  to(
-    value: moment$Moment | string | number | Date | Array<number>,
-    removePrefix?: boolean
-  ): string,
-  calendar(refTime?: any, formats?: moment$CalendarFormats): string,
-  diff(
-    date: moment$Moment | string | number | Date | Array<number>,
-    format?: string,
-    floating?: boolean
-  ): number,
-  valueOf(): number,
-  unix(): number,
-  daysInMonth(): number,
-  toDate(): Date,
-  toArray(): Array<number>,
-  toJSON(): string,
-  toISOString(
-    keepOffset?: boolean
-  ): string,
-  toObject(): moment$MomentObject,
-  isBefore(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isSame(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isAfter(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isSameOrBefore(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isSameOrAfter(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isBetween(
-    fromDate: moment$Moment | string | number | Date | Array<number>,
-    toDate?: ?moment$Moment | string | number | Date | Array<number>,
-    granularity?: ?string,
-    inclusion?: ?string
-  ): boolean,
-  isDST(): boolean,
-  isDSTShifted(): boolean,
-  isLeapYear(): boolean,
-  clone(): moment$Moment,
-  static isMoment(obj: any): boolean,
-  static isDate(obj: any): boolean,
-  static locale(locale: string, localeData?: Object): string,
-  static updateLocale(locale: string, localeData?: ?Object): void,
-  static locale(locales: Array<string>): string,
-  locale(locale: string, customization?: Object | null): moment$Moment,
-  locale(): string,
-  static months(): Array<string>,
-  static monthsShort(): Array<string>,
-  static weekdays(): Array<string>,
-  static weekdaysShort(): Array<string>,
-  static weekdaysMin(): Array<string>,
-  static months(): string,
-  static monthsShort(): string,
-  static weekdays(): string,
-  static weekdaysShort(): string,
-  static weekdaysMin(): string,
-  static localeData(key?: string): moment$LocaleData,
-  static duration(
-    value: number | Object | string,
-    unit?: string
-  ): moment$MomentDuration,
-  static isDuration(obj: any): boolean,
-  static normalizeUnits(unit: string): string,
-  static invalid(object: any): moment$Moment
-}
-
-declare module "moment" {
-  declare module.exports: Class<moment$Moment>;
-}
diff --git a/scm-plugins/scm-git-plugin/flow-typed/npm/react-jss_vx.x.x.js b/scm-plugins/scm-git-plugin/flow-typed/npm/react-jss_vx.x.x.js
deleted file mode 100644
index cf8abae155..0000000000
--- a/scm-plugins/scm-git-plugin/flow-typed/npm/react-jss_vx.x.x.js
+++ /dev/null
@@ -1,137 +0,0 @@
-// flow-typed signature: ba35d02d668b0d0a3e04a63a6847974e
-// flow-typed version: <<STUB>>/react-jss_v8.6.1/flow_v0.79.1
-
-/**
- * This is an autogenerated libdef stub for:
- *
- *   'react-jss'
- *
- * Fill this stub out by replacing all the `any` types.
- *
- * Once filled out, we encourage you to share your work with the
- * community by sending a pull request to:
- * https://github.com/flowtype/flow-typed
- */
-
-declare module 'react-jss' {
-  declare module.exports: any;
-}
-
-/**
- * We include stubs for each file inside this npm package in case you need to
- * require those files directly. Feel free to delete any files that aren't
- * needed.
- */
-declare module 'react-jss/dist/react-jss' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/dist/react-jss.min' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/compose' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/compose.test' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/contextTypes' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/createHoc' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/getDisplayName' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/index' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/index.test' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/injectSheet' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/injectSheet.test' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/jss' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/JssProvider' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/JssProvider.test' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/ns' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/propTypes' {
-  declare module.exports: any;
-}
-
-// Filename aliases
-declare module 'react-jss/dist/react-jss.js' {
-  declare module.exports: $Exports<'react-jss/dist/react-jss'>;
-}
-declare module 'react-jss/dist/react-jss.min.js' {
-  declare module.exports: $Exports<'react-jss/dist/react-jss.min'>;
-}
-declare module 'react-jss/lib/compose.js' {
-  declare module.exports: $Exports<'react-jss/lib/compose'>;
-}
-declare module 'react-jss/lib/compose.test.js' {
-  declare module.exports: $Exports<'react-jss/lib/compose.test'>;
-}
-declare module 'react-jss/lib/contextTypes.js' {
-  declare module.exports: $Exports<'react-jss/lib/contextTypes'>;
-}
-declare module 'react-jss/lib/createHoc.js' {
-  declare module.exports: $Exports<'react-jss/lib/createHoc'>;
-}
-declare module 'react-jss/lib/getDisplayName.js' {
-  declare module.exports: $Exports<'react-jss/lib/getDisplayName'>;
-}
-declare module 'react-jss/lib/index.js' {
-  declare module.exports: $Exports<'react-jss/lib/index'>;
-}
-declare module 'react-jss/lib/index.test.js' {
-  declare module.exports: $Exports<'react-jss/lib/index.test'>;
-}
-declare module 'react-jss/lib/injectSheet.js' {
-  declare module.exports: $Exports<'react-jss/lib/injectSheet'>;
-}
-declare module 'react-jss/lib/injectSheet.test.js' {
-  declare module.exports: $Exports<'react-jss/lib/injectSheet.test'>;
-}
-declare module 'react-jss/lib/jss.js' {
-  declare module.exports: $Exports<'react-jss/lib/jss'>;
-}
-declare module 'react-jss/lib/JssProvider.js' {
-  declare module.exports: $Exports<'react-jss/lib/JssProvider'>;
-}
-declare module 'react-jss/lib/JssProvider.test.js' {
-  declare module.exports: $Exports<'react-jss/lib/JssProvider.test'>;
-}
-declare module 'react-jss/lib/ns.js' {
-  declare module.exports: $Exports<'react-jss/lib/ns'>;
-}
-declare module 'react-jss/lib/propTypes.js' {
-  declare module.exports: $Exports<'react-jss/lib/propTypes'>;
-}
diff --git a/scm-plugins/scm-hg-plugin/.flowconfig b/scm-plugins/scm-hg-plugin/.flowconfig
index 7ede008602..b05e157358 100644
--- a/scm-plugins/scm-hg-plugin/.flowconfig
+++ b/scm-plugins/scm-hg-plugin/.flowconfig
@@ -4,5 +4,6 @@
 [include]
 
 [libs]
+./node_modules/@scm-manager/ui-components/flow-typed
 
 [options]
diff --git a/scm-plugins/scm-hg-plugin/flow-typed/npm/classnames_v2.x.x.js b/scm-plugins/scm-hg-plugin/flow-typed/npm/classnames_v2.x.x.js
deleted file mode 100644
index 2307243eeb..0000000000
--- a/scm-plugins/scm-hg-plugin/flow-typed/npm/classnames_v2.x.x.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// flow-typed signature: cf86673cc32d185bdab1d2ea90578d37
-// flow-typed version: 614bf49aa8/classnames_v2.x.x/flow_>=v0.25.x
-
-type $npm$classnames$Classes =
-  | string
-  | { [className: string]: * }
-  | false
-  | void
-  | null;
-
-declare module "classnames" {
-  declare module.exports: (
-    ...classes: Array<$npm$classnames$Classes | $npm$classnames$Classes[]>
-  ) => string;
-}
-
-declare module "classnames/bind" {
-  declare module.exports: $Exports<"classnames">;
-}
-
-declare module "classnames/dedupe" {
-  declare module.exports: $Exports<"classnames">;
-}
diff --git a/scm-plugins/scm-hg-plugin/flow-typed/npm/jest_v23.x.x.js b/scm-plugins/scm-hg-plugin/flow-typed/npm/jest_v23.x.x.js
deleted file mode 100644
index 23b66b07e5..0000000000
--- a/scm-plugins/scm-hg-plugin/flow-typed/npm/jest_v23.x.x.js
+++ /dev/null
@@ -1,1108 +0,0 @@
-// flow-typed signature: f5a484315a3dea13d273645306e4076a
-// flow-typed version: 7c5d14b3d4/jest_v23.x.x/flow_>=v0.39.x
-
-type JestMockFn<TArguments: $ReadOnlyArray<*>, TReturn> = {
-  (...args: TArguments): TReturn,
-  /**
-   * An object for introspecting mock calls
-   */
-  mock: {
-    /**
-     * An array that represents all calls that have been made into this mock
-     * function. Each call is represented by an array of arguments that were
-     * passed during the call.
-     */
-    calls: Array<TArguments>,
-    /**
-     * An array that contains all the object instances that have been
-     * instantiated from this mock function.
-     */
-    instances: Array<TReturn>
-  },
-  /**
-   * Resets all information stored in the mockFn.mock.calls and
-   * mockFn.mock.instances arrays. Often this is useful when you want to clean
-   * up a mock's usage data between two assertions.
-   */
-  mockClear(): void,
-  /**
-   * Resets all information stored in the mock. This is useful when you want to
-   * completely restore a mock back to its initial state.
-   */
-  mockReset(): void,
-  /**
-   * Removes the mock and restores the initial implementation. This is useful
-   * when you want to mock functions in certain test cases and restore the
-   * original implementation in others. Beware that mockFn.mockRestore only
-   * works when mock was created with jest.spyOn. Thus you have to take care of
-   * restoration yourself when manually assigning jest.fn().
-   */
-  mockRestore(): void,
-  /**
-   * Accepts a function that should be used as the implementation of the mock.
-   * The mock itself will still record all calls that go into and instances
-   * that come from itself -- the only difference is that the implementation
-   * will also be executed when the mock is called.
-   */
-  mockImplementation(
-    fn: (...args: TArguments) => TReturn
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a function that will be used as an implementation of the mock for
-   * one call to the mocked function. Can be chained so that multiple function
-   * calls produce different results.
-   */
-  mockImplementationOnce(
-    fn: (...args: TArguments) => TReturn
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a string to use in test result output in place of "jest.fn()" to
-   * indicate which mock function is being referenced.
-   */
-  mockName(name: string): JestMockFn<TArguments, TReturn>,
-  /**
-   * Just a simple sugar function for returning `this`
-   */
-  mockReturnThis(): void,
-  /**
-   * Accepts a value that will be returned whenever the mock function is called.
-   */
-  mockReturnValue(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for only returning a value once inside your mock
-   */
-  mockReturnValueOnce(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.resolve(value))
-   */
-  mockResolvedValue(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.resolve(value))
-   */
-  mockResolvedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.reject(value))
-   */
-  mockRejectedValue(value: TReturn): JestMockFn<TArguments, Promise<any>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.reject(value))
-   */
-  mockRejectedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<any>>
-};
-
-type JestAsymmetricEqualityType = {
-  /**
-   * A custom Jasmine equality tester
-   */
-  asymmetricMatch(value: mixed): boolean
-};
-
-type JestCallsType = {
-  allArgs(): mixed,
-  all(): mixed,
-  any(): boolean,
-  count(): number,
-  first(): mixed,
-  mostRecent(): mixed,
-  reset(): void
-};
-
-type JestClockType = {
-  install(): void,
-  mockDate(date: Date): void,
-  tick(milliseconds?: number): void,
-  uninstall(): void
-};
-
-type JestMatcherResult = {
-  message?: string | (() => string),
-  pass: boolean
-};
-
-type JestMatcher = (actual: any, expected: any) => JestMatcherResult;
-
-type JestPromiseType = {
-  /**
-   * Use rejects to unwrap the reason of a rejected promise so any other
-   * matcher can be chained. If the promise is fulfilled the assertion fails.
-   */
-  rejects: JestExpectType,
-  /**
-   * Use resolves to unwrap the value of a fulfilled promise so any other
-   * matcher can be chained. If the promise is rejected the assertion fails.
-   */
-  resolves: JestExpectType
-};
-
-/**
- * Jest allows functions and classes to be used as test names in test() and
- * describe()
- */
-type JestTestName = string | Function;
-
-/**
- *  Plugin: jest-styled-components
- */
-
-type JestStyledComponentsMatcherValue =
-  | string
-  | JestAsymmetricEqualityType
-  | RegExp
-  | typeof undefined;
-
-type JestStyledComponentsMatcherOptions = {
-  media?: string;
-  modifier?: string;
-  supports?: string;
-}
-
-type JestStyledComponentsMatchersType = {
-  toHaveStyleRule(
-    property: string,
-    value: JestStyledComponentsMatcherValue,
-    options?: JestStyledComponentsMatcherOptions
-  ): void,
-};
-
-/**
- *  Plugin: jest-enzyme
- */
-type EnzymeMatchersType = {
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmpty(): void,
-  toBeEmptyRender(): void,
-  toBePresent(): void,
-  toContainReact(element: React$Element<any>): void,
-  toExist(): void,
-  toHaveClassName(className: string): void,
-  toHaveHTML(html: string): void,
-  toHaveProp: ((propKey: string, propValue?: any) => void) & ((props: Object) => void),
-  toHaveRef(refName: string): void,
-  toHaveState: ((stateKey: string, stateValue?: any) => void) & ((state: Object) => void),
-  toHaveStyle: ((styleKey: string, styleValue?: any) => void) & ((style: Object) => void),
-  toHaveTagName(tagName: string): void,
-  toHaveText(text: string): void,
-  toIncludeText(text: string): void,
-  toHaveValue(value: any): void,
-  toMatchElement(element: React$Element<any>): void,
-  toMatchSelector(selector: string): void
-};
-
-// DOM testing library extensions https://github.com/kentcdodds/dom-testing-library#custom-jest-matchers
-type DomTestingLibraryType = {
-  toBeInTheDOM(): void,
-  toHaveTextContent(content: string): void,
-  toHaveAttribute(name: string, expectedValue?: string): void
-};
-
-// Jest JQuery Matchers: https://github.com/unindented/custom-jquery-matchers
-type JestJQueryMatchersType = {
-  toExist(): void,
-  toHaveLength(len: number): void,
-  toHaveId(id: string): void,
-  toHaveClass(className: string): void,
-  toHaveTag(tag: string): void,
-  toHaveAttr(key: string, val?: any): void,
-  toHaveProp(key: string, val?: any): void,
-  toHaveText(text: string | RegExp): void,
-  toHaveData(key: string, val?: any): void,
-  toHaveValue(val: any): void,
-  toHaveCss(css: {[key: string]: any}): void,
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmpty(): void,
-  toBeHidden(): void,
-  toBeSelected(): void,
-  toBeVisible(): void,
-  toBeFocused(): void,
-  toBeInDom(): void,
-  toBeMatchedBy(sel: string): void,
-  toHaveDescendant(sel: string): void,
-  toHaveDescendantWithText(sel: string, text: string | RegExp): void
-};
-
-
-// Jest Extended Matchers: https://github.com/jest-community/jest-extended
-type JestExtendedMatchersType = {
-  /**
-     * Note: Currently unimplemented
-     * Passing assertion
-     *
-     * @param {String} message
-     */
-  //  pass(message: string): void;
-
-    /**
-     * Note: Currently unimplemented
-     * Failing assertion
-     *
-     * @param {String} message
-     */
-  //  fail(message: string): void;
-
-    /**
-     * Use .toBeEmpty when checking if a String '', Array [] or Object {} is empty.
-     */
-    toBeEmpty(): void;
-
-    /**
-     * Use .toBeOneOf when checking if a value is a member of a given Array.
-     * @param {Array.<*>} members
-     */
-    toBeOneOf(members: any[]): void;
-
-    /**
-     * Use `.toBeNil` when checking a value is `null` or `undefined`.
-     */
-    toBeNil(): void;
-
-    /**
-     * Use `.toSatisfy` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean`.
-     * @param {Function} predicate
-     */
-    toSatisfy(predicate: (n: any) => boolean): void;
-
-    /**
-     * Use `.toBeArray` when checking if a value is an `Array`.
-     */
-    toBeArray(): void;
-
-    /**
-     * Use `.toBeArrayOfSize` when checking if a value is an `Array` of size x.
-     * @param {Number} x
-     */
-    toBeArrayOfSize(x: number): void;
-
-    /**
-     * Use `.toIncludeAllMembers` when checking if an `Array` contains all of the same members of a given set.
-     * @param {Array.<*>} members
-     */
-    toIncludeAllMembers(members: any[]): void;
-
-    /**
-     * Use `.toIncludeAnyMembers` when checking if an `Array` contains any of the members of a given set.
-     * @param {Array.<*>} members
-     */
-    toIncludeAnyMembers(members: any[]): void;
-
-    /**
-     * Use `.toSatisfyAll` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean` for all values in an array.
-     * @param {Function} predicate
-     */
-    toSatisfyAll(predicate: (n: any) => boolean): void;
-
-    /**
-     * Use `.toBeBoolean` when checking if a value is a `Boolean`.
-     */
-    toBeBoolean(): void;
-
-    /**
-     * Use `.toBeTrue` when checking a value is equal (===) to `true`.
-     */
-    toBeTrue(): void;
-
-    /**
-     * Use `.toBeFalse` when checking a value is equal (===) to `false`.
-     */
-    toBeFalse(): void;
-
-    /**
-     * Use .toBeDate when checking if a value is a Date.
-     */
-    toBeDate(): void;
-
-    /**
-     * Use `.toBeFunction` when checking if a value is a `Function`.
-     */
-    toBeFunction(): void;
-
-    /**
-     * Use `.toHaveBeenCalledBefore` when checking if a `Mock` was called before another `Mock`.
-     *
-     * Note: Required Jest version >22
-     * Note: Your mock functions will have to be asynchronous to cause the timestamps inside of Jest to occur in a differentJS event loop, otherwise the mock timestamps will all be the same
-     *
-     * @param {Mock} mock
-     */
-    toHaveBeenCalledBefore(mock: JestMockFn<any, any>): void;
-
-    /**
-     * Use `.toBeNumber` when checking if a value is a `Number`.
-     */
-    toBeNumber(): void;
-
-    /**
-     * Use `.toBeNaN` when checking a value is `NaN`.
-     */
-    toBeNaN(): void;
-
-    /**
-     * Use `.toBeFinite` when checking if a value is a `Number`, not `NaN` or `Infinity`.
-     */
-    toBeFinite(): void;
-
-    /**
-     * Use `.toBePositive` when checking if a value is a positive `Number`.
-     */
-    toBePositive(): void;
-
-    /**
-     * Use `.toBeNegative` when checking if a value is a negative `Number`.
-     */
-    toBeNegative(): void;
-
-    /**
-     * Use `.toBeEven` when checking if a value is an even `Number`.
-     */
-    toBeEven(): void;
-
-    /**
-     * Use `.toBeOdd` when checking if a value is an odd `Number`.
-     */
-    toBeOdd(): void;
-
-    /**
-     * Use `.toBeWithin` when checking if a number is in between the given bounds of: start (inclusive) and end (exclusive).
-     *
-     * @param {Number} start
-     * @param {Number} end
-     */
-    toBeWithin(start: number, end: number): void;
-
-    /**
-     * Use `.toBeObject` when checking if a value is an `Object`.
-     */
-    toBeObject(): void;
-
-    /**
-     * Use `.toContainKey` when checking if an object contains the provided key.
-     *
-     * @param {String} key
-     */
-    toContainKey(key: string): void;
-
-    /**
-     * Use `.toContainKeys` when checking if an object has all of the provided keys.
-     *
-     * @param {Array.<String>} keys
-     */
-    toContainKeys(keys: string[]): void;
-
-    /**
-     * Use `.toContainAllKeys` when checking if an object only contains all of the provided keys.
-     *
-     * @param {Array.<String>} keys
-     */
-    toContainAllKeys(keys: string[]): void;
-
-    /**
-     * Use `.toContainAnyKeys` when checking if an object contains at least one of the provided keys.
-     *
-     * @param {Array.<String>} keys
-     */
-    toContainAnyKeys(keys: string[]): void;
-
-    /**
-     * Use `.toContainValue` when checking if an object contains the provided value.
-     *
-     * @param {*} value
-     */
-    toContainValue(value: any): void;
-
-    /**
-     * Use `.toContainValues` when checking if an object contains all of the provided values.
-     *
-     * @param {Array.<*>} values
-     */
-    toContainValues(values: any[]): void;
-
-    /**
-     * Use `.toContainAllValues` when checking if an object only contains all of the provided values.
-     *
-     * @param {Array.<*>} values
-     */
-    toContainAllValues(values: any[]): void;
-
-    /**
-     * Use `.toContainAnyValues` when checking if an object contains at least one of the provided values.
-     *
-     * @param {Array.<*>} values
-     */
-    toContainAnyValues(values: any[]): void;
-
-    /**
-     * Use `.toContainEntry` when checking if an object contains the provided entry.
-     *
-     * @param {Array.<String, String>} entry
-     */
-    toContainEntry(entry: [string, string]): void;
-
-    /**
-     * Use `.toContainEntries` when checking if an object contains all of the provided entries.
-     *
-     * @param {Array.<Array.<String, String>>} entries
-     */
-    toContainEntries(entries: [string, string][]): void;
-
-    /**
-     * Use `.toContainAllEntries` when checking if an object only contains all of the provided entries.
-     *
-     * @param {Array.<Array.<String, String>>} entries
-     */
-    toContainAllEntries(entries: [string, string][]): void;
-
-    /**
-     * Use `.toContainAnyEntries` when checking if an object contains at least one of the provided entries.
-     *
-     * @param {Array.<Array.<String, String>>} entries
-     */
-    toContainAnyEntries(entries: [string, string][]): void;
-
-    /**
-     * Use `.toBeExtensible` when checking if an object is extensible.
-     */
-    toBeExtensible(): void;
-
-    /**
-     * Use `.toBeFrozen` when checking if an object is frozen.
-     */
-    toBeFrozen(): void;
-
-    /**
-     * Use `.toBeSealed` when checking if an object is sealed.
-     */
-    toBeSealed(): void;
-
-    /**
-     * Use `.toBeString` when checking if a value is a `String`.
-     */
-    toBeString(): void;
-
-    /**
-     * Use `.toEqualCaseInsensitive` when checking if a string is equal (===) to another ignoring the casing of both strings.
-     *
-     * @param {String} string
-     */
-    toEqualCaseInsensitive(string: string): void;
-
-    /**
-     * Use `.toStartWith` when checking if a `String` starts with a given `String` prefix.
-     *
-     * @param {String} prefix
-     */
-    toStartWith(prefix: string): void;
-
-    /**
-     * Use `.toEndWith` when checking if a `String` ends with a given `String` suffix.
-     *
-     * @param {String} suffix
-     */
-    toEndWith(suffix: string): void;
-
-    /**
-     * Use `.toInclude` when checking if a `String` includes the given `String` substring.
-     *
-     * @param {String} substring
-     */
-    toInclude(substring: string): void;
-
-    /**
-     * Use `.toIncludeRepeated` when checking if a `String` includes the given `String` substring the correct number of times.
-     *
-     * @param {String} substring
-     * @param {Number} times
-     */
-    toIncludeRepeated(substring: string, times: number): void;
-
-    /**
-     * Use `.toIncludeMultiple` when checking if a `String` includes all of the given substrings.
-     *
-     * @param {Array.<String>} substring
-     */
-    toIncludeMultiple(substring: string[]): void;
-};
-
-interface JestExpectType {
-  not:
-    & JestExpectType
-    & EnzymeMatchersType
-    & DomTestingLibraryType
-    & JestJQueryMatchersType
-    & JestStyledComponentsMatchersType
-    & JestExtendedMatchersType,
-  /**
-   * If you have a mock function, you can use .lastCalledWith to test what
-   * arguments it was last called with.
-   */
-  lastCalledWith(...args: Array<any>): void,
-  /**
-   * toBe just checks that a value is what you expect. It uses === to check
-   * strict equality.
-   */
-  toBe(value: any): void,
-  /**
-   * Use .toBeCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toBeCalledWith(...args: Array<any>): void,
-  /**
-   * Using exact equality with floating point numbers is a bad idea. Rounding
-   * means that intuitive things fail.
-   */
-  toBeCloseTo(num: number, delta: any): void,
-  /**
-   * Use .toBeDefined to check that a variable is not undefined.
-   */
-  toBeDefined(): void,
-  /**
-   * Use .toBeFalsy when you don't care what a value is, you just want to
-   * ensure a value is false in a boolean context.
-   */
-  toBeFalsy(): void,
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThan.
-   */
-  toBeGreaterThan(number: number): void,
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThanOrEqual.
-   */
-  toBeGreaterThanOrEqual(number: number): void,
-  /**
-   * To compare floating point numbers, you can use toBeLessThan.
-   */
-  toBeLessThan(number: number): void,
-  /**
-   * To compare floating point numbers, you can use toBeLessThanOrEqual.
-   */
-  toBeLessThanOrEqual(number: number): void,
-  /**
-   * Use .toBeInstanceOf(Class) to check that an object is an instance of a
-   * class.
-   */
-  toBeInstanceOf(cls: Class<*>): void,
-  /**
-   * .toBeNull() is the same as .toBe(null) but the error messages are a bit
-   * nicer.
-   */
-  toBeNull(): void,
-  /**
-   * Use .toBeTruthy when you don't care what a value is, you just want to
-   * ensure a value is true in a boolean context.
-   */
-  toBeTruthy(): void,
-  /**
-   * Use .toBeUndefined to check that a variable is undefined.
-   */
-  toBeUndefined(): void,
-  /**
-   * Use .toContain when you want to check that an item is in a list. For
-   * testing the items in the list, this uses ===, a strict equality check.
-   */
-  toContain(item: any): void,
-  /**
-   * Use .toContainEqual when you want to check that an item is in a list. For
-   * testing the items in the list, this matcher recursively checks the
-   * equality of all fields, rather than checking for object identity.
-   */
-  toContainEqual(item: any): void,
-  /**
-   * Use .toEqual when you want to check that two objects have the same value.
-   * This matcher recursively checks the equality of all fields, rather than
-   * checking for object identity.
-   */
-  toEqual(value: any): void,
-  /**
-   * Use .toHaveBeenCalled to ensure that a mock function got called.
-   */
-  toHaveBeenCalled(): void,
-  toBeCalled(): void;
-  /**
-   * Use .toHaveBeenCalledTimes to ensure that a mock function got called exact
-   * number of times.
-   */
-  toHaveBeenCalledTimes(number: number): void,
-  toBeCalledTimes(number: number): void;
-  /**
-   *
-   */
-  toHaveBeenNthCalledWith(nthCall: number, ...args: Array<any>): void;
-  nthCalledWith(nthCall: number, ...args: Array<any>): void;
-  /**
-   *
-   */
-  toHaveReturned(): void;
-  toReturn(): void;
-  /**
-   *
-   */
-  toHaveReturnedTimes(number: number): void;
-  toReturnTimes(number: number): void;
-  /**
-   *
-   */
-  toHaveReturnedWith(value: any): void;
-  toReturnWith(value: any): void;
-  /**
-   *
-   */
-  toHaveLastReturnedWith(value: any): void;
-  lastReturnedWith(value: any): void;
-  /**
-   *
-   */
-  toHaveNthReturnedWith(nthCall: number, value: any): void;
-  nthReturnedWith(nthCall: number, value: any): void;
-  /**
-   * Use .toHaveBeenCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toHaveBeenCalledWith(...args: Array<any>): void,
-  toBeCalledWith(...args: Array<any>): void,
-  /**
-   * Use .toHaveBeenLastCalledWith to ensure that a mock function was last called
-   * with specific arguments.
-   */
-  toHaveBeenLastCalledWith(...args: Array<any>): void,
-  lastCalledWith(...args: Array<any>): void,
-  /**
-   * Check that an object has a .length property and it is set to a certain
-   * numeric value.
-   */
-  toHaveLength(number: number): void,
-  /**
-   *
-   */
-  toHaveProperty(propPath: string, value?: any): void,
-  /**
-   * Use .toMatch to check that a string matches a regular expression or string.
-   */
-  toMatch(regexpOrString: RegExp | string): void,
-  /**
-   * Use .toMatchObject to check that a javascript object matches a subset of the properties of an object.
-   */
-  toMatchObject(object: Object | Array<Object>): void,
-  /**
-   * Use .toStrictEqual to check that a javascript object matches a subset of the properties of an object.
-   */
-  toStrictEqual(value: any): void,
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(propertyMatchers?: {[key: string]: JestAsymmetricEqualityType}, name?: string): void,
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(name: string): void,
-
-  toMatchInlineSnapshot(snapshot?: string): void,
-  toMatchInlineSnapshot(propertyMatchers?: {[key: string]: JestAsymmetricEqualityType}, snapshot?: string): void,
-  /**
-   * Use .toThrow to test that a function throws when it is called.
-   * If you want to test that a specific error gets thrown, you can provide an
-   * argument to toThrow. The argument can be a string for the error message,
-   * a class for the error, or a regex that should match the error.
-   *
-   * Alias: .toThrowError
-   */
-  toThrow(message?: string | Error | Class<Error> | RegExp): void,
-  toThrowError(message?: string | Error | Class<Error> | RegExp): void,
-  /**
-   * Use .toThrowErrorMatchingSnapshot to test that a function throws a error
-   * matching the most recent snapshot when it is called.
-   */
-  toThrowErrorMatchingSnapshot(): void,
-  toThrowErrorMatchingInlineSnapshot(snapshot?: string): void,
-}
-
-type JestObjectType = {
-  /**
-   *  Disables automatic mocking in the module loader.
-   *
-   *  After this method is called, all `require()`s will return the real
-   *  versions of each module (rather than a mocked version).
-   */
-  disableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of disableAutomock
-   */
-  autoMockOff(): JestObjectType,
-  /**
-   * Enables automatic mocking in the module loader.
-   */
-  enableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of enableAutomock
-   */
-  autoMockOn(): JestObjectType,
-  /**
-   * Clears the mock.calls and mock.instances properties of all mocks.
-   * Equivalent to calling .mockClear() on every mocked function.
-   */
-  clearAllMocks(): JestObjectType,
-  /**
-   * Resets the state of all mocks. Equivalent to calling .mockReset() on every
-   * mocked function.
-   */
-  resetAllMocks(): JestObjectType,
-  /**
-   * Restores all mocks back to their original value.
-   */
-  restoreAllMocks(): JestObjectType,
-  /**
-   * Removes any pending timers from the timer system.
-   */
-  clearAllTimers(): void,
-  /**
-   * The same as `mock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  doMock(moduleName: string, moduleFactory?: any): JestObjectType,
-  /**
-   * The same as `unmock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  dontMock(moduleName: string): JestObjectType,
-  /**
-   * Returns a new, unused mock function. Optionally takes a mock
-   * implementation.
-   */
-  fn<TArguments: $ReadOnlyArray<*>, TReturn>(
-    implementation?: (...args: TArguments) => TReturn
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Determines if the given function is a mocked function.
-   */
-  isMockFunction(fn: Function): boolean,
-  /**
-   * Given the name of a module, use the automatic mocking system to generate a
-   * mocked version of the module for you.
-   */
-  genMockFromModule(moduleName: string): any,
-  /**
-   * Mocks a module with an auto-mocked version when it is being required.
-   *
-   * The second argument can be used to specify an explicit module factory that
-   * is being run instead of using Jest's automocking feature.
-   *
-   * The third argument can be used to create virtual mocks -- mocks of modules
-   * that don't exist anywhere in the system.
-   */
-  mock(
-    moduleName: string,
-    moduleFactory?: any,
-    options?: Object
-  ): JestObjectType,
-  /**
-   * Returns the actual module instead of a mock, bypassing all checks on
-   * whether the module should receive a mock implementation or not.
-   */
-  requireActual(moduleName: string): any,
-  /**
-   * Returns a mock module instead of the actual module, bypassing all checks
-   * on whether the module should be required normally or not.
-   */
-  requireMock(moduleName: string): any,
-  /**
-   * Resets the module registry - the cache of all required modules. This is
-   * useful to isolate modules where local state might conflict between tests.
-   */
-  resetModules(): JestObjectType,
-  /**
-   * Exhausts the micro-task queue (usually interfaced in node via
-   * process.nextTick).
-   */
-  runAllTicks(): void,
-  /**
-   * Exhausts the macro-task queue (i.e., all tasks queued by setTimeout(),
-   * setInterval(), and setImmediate()).
-   */
-  runAllTimers(): void,
-  /**
-   * Exhausts all tasks queued by setImmediate().
-   */
-  runAllImmediates(): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   */
-  advanceTimersByTime(msToRun: number): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   *
-   * Renamed to `advanceTimersByTime`.
-   */
-  runTimersToTime(msToRun: number): void,
-  /**
-   * Executes only the macro-tasks that are currently pending (i.e., only the
-   * tasks that have been queued by setTimeout() or setInterval() up to this
-   * point)
-   */
-  runOnlyPendingTimers(): void,
-  /**
-   * Explicitly supplies the mock object that the module system should return
-   * for the specified module. Note: It is recommended to use jest.mock()
-   * instead.
-   */
-  setMock(moduleName: string, moduleExports: any): JestObjectType,
-  /**
-   * Indicates that the module system should never return a mocked version of
-   * the specified module from require() (e.g. that it should always return the
-   * real module).
-   */
-  unmock(moduleName: string): JestObjectType,
-  /**
-   * Instructs Jest to use fake versions of the standard timer functions
-   * (setTimeout, setInterval, clearTimeout, clearInterval, nextTick,
-   * setImmediate and clearImmediate).
-   */
-  useFakeTimers(): JestObjectType,
-  /**
-   * Instructs Jest to use the real versions of the standard timer functions.
-   */
-  useRealTimers(): JestObjectType,
-  /**
-   * Creates a mock function similar to jest.fn but also tracks calls to
-   * object[methodName].
-   */
-  spyOn(object: Object, methodName: string, accessType?: "get" | "set"): JestMockFn<any, any>,
-  /**
-   * Set the default timeout interval for tests and before/after hooks in milliseconds.
-   * Note: The default timeout interval is 5 seconds if this method is not called.
-   */
-  setTimeout(timeout: number): JestObjectType
-};
-
-type JestSpyType = {
-  calls: JestCallsType
-};
-
-/** Runs this function after every test inside this context */
-declare function afterEach(
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-/** Runs this function before every test inside this context */
-declare function beforeEach(
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-/** Runs this function after all tests have finished inside this context */
-declare function afterAll(
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-/** Runs this function before any tests have started inside this context */
-declare function beforeAll(
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-
-/** A context for grouping tests together */
-declare var describe: {
-  /**
-   * Creates a block that groups together several related tests in one "test suite"
-   */
-  (name: JestTestName, fn: () => void): void,
-
-  /**
-   * Only run this describe block
-   */
-  only(name: JestTestName, fn: () => void): void,
-
-  /**
-   * Skip running this describe block
-   */
-  skip(name: JestTestName, fn: () => void): void
-};
-
-/** An individual test unit */
-declare var it: {
-  /**
-   * An individual test unit
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  (
-    name: JestTestName,
-    fn?: (done: () => void) => ?Promise<mixed>,
-    timeout?: number
-  ): void,
-  /**
-   * each runs this test against array of argument arrays per each run
-   *
-   * @param {table} table of Test
-   */
-  each(
-    table: Array<Array<mixed>>
-  ): (
-    name: JestTestName,
-    fn?: (...args: Array<any>) => ?Promise<mixed>
-  ) => void,
-  /**
-   * Only run this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  only(
-    name: JestTestName,
-    fn?: (done: () => void) => ?Promise<mixed>,
-    timeout?: number
-  ): {
-    each(
-      table: Array<Array<mixed>>
-    ): (
-      name: JestTestName,
-      fn?: (...args: Array<any>) => ?Promise<mixed>
-    ) => void,
-  },
-  /**
-   * Skip running this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  skip(
-    name: JestTestName,
-    fn?: (done: () => void) => ?Promise<mixed>,
-    timeout?: number
-  ): void,
-  /**
-   * Run the test concurrently
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  concurrent(
-    name: JestTestName,
-    fn?: (done: () => void) => ?Promise<mixed>,
-    timeout?: number
-  ): void
-};
-declare function fit(
-  name: JestTestName,
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-/** An individual test unit */
-declare var test: typeof it;
-/** A disabled group of tests */
-declare var xdescribe: typeof describe;
-/** A focused group of tests */
-declare var fdescribe: typeof describe;
-/** A disabled individual test */
-declare var xit: typeof it;
-/** A disabled individual test */
-declare var xtest: typeof it;
-
-type JestPrettyFormatColors = {
-  comment: { close: string, open: string },
-  content: { close: string, open: string },
-  prop: { close: string, open: string },
-  tag: { close: string, open: string },
-  value: { close: string, open: string },
-};
-
-type JestPrettyFormatIndent = string => string;
-type JestPrettyFormatRefs = Array<any>;
-type JestPrettyFormatPrint = any => string;
-type JestPrettyFormatStringOrNull = string | null;
-
-type JestPrettyFormatOptions = {|
-  callToJSON: boolean,
-  edgeSpacing: string,
-  escapeRegex: boolean,
-  highlight: boolean,
-  indent: number,
-  maxDepth: number,
-  min: boolean,
-  plugins: JestPrettyFormatPlugins,
-  printFunctionName: boolean,
-  spacing: string,
-  theme: {|
-    comment: string,
-    content: string,
-    prop: string,
-    tag: string,
-    value: string,
-  |},
-|};
-
-type JestPrettyFormatPlugin = {
-  print: (
-    val: any,
-    serialize: JestPrettyFormatPrint,
-    indent: JestPrettyFormatIndent,
-    opts: JestPrettyFormatOptions,
-    colors: JestPrettyFormatColors,
-  ) => string,
-  test: any => boolean,
-};
-
-type JestPrettyFormatPlugins = Array<JestPrettyFormatPlugin>;
-
-/** The expect function is used every time you want to test a value */
-declare var expect: {
-  /** The object that you want to make assertions against */
-  (value: any):
-    & JestExpectType
-    & JestPromiseType
-    & EnzymeMatchersType
-    & DomTestingLibraryType
-    & JestJQueryMatchersType
-    & JestStyledComponentsMatchersType
-    & JestExtendedMatchersType,
-
-  /** Add additional Jasmine matchers to Jest's roster */
-  extend(matchers: { [name: string]: JestMatcher }): void,
-  /** Add a module that formats application-specific data structures. */
-  addSnapshotSerializer(pluginModule: JestPrettyFormatPlugin): void,
-  assertions(expectedAssertions: number): void,
-  hasAssertions(): void,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  objectContaining(value: Object): Object,
-  /** Matches any received string that contains the exact expected string. */
-  stringContaining(value: string): string,
-  stringMatching(value: string | RegExp): string,
-  not: {
-    arrayContaining: (value: $ReadOnlyArray<mixed>) => Array<mixed>,
-    objectContaining: (value: {}) => Object,
-    stringContaining: (value: string) => string,
-    stringMatching: (value: string | RegExp) => string,
-  },
-};
-
-// TODO handle return type
-// http://jasmine.github.io/2.4/introduction.html#section-Spies
-declare function spyOn(value: mixed, method: string): Object;
-
-/** Holds all functions related to manipulating test runner */
-declare var jest: JestObjectType;
-
-/**
- * The global Jasmine object, this is generally not exposed as the public API,
- * using features inside here could break in later versions of Jest.
- */
-declare var jasmine: {
-  DEFAULT_TIMEOUT_INTERVAL: number,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  clock(): JestClockType,
-  createSpy(name: string): JestSpyType,
-  createSpyObj(
-    baseName: string,
-    methodNames: Array<string>
-  ): { [methodName: string]: JestSpyType },
-  objectContaining(value: Object): Object,
-  stringMatching(value: string): string
-};
diff --git a/scm-plugins/scm-hg-plugin/flow-typed/npm/moment_v2.3.x.js b/scm-plugins/scm-hg-plugin/flow-typed/npm/moment_v2.3.x.js
deleted file mode 100644
index c2786e87fd..0000000000
--- a/scm-plugins/scm-hg-plugin/flow-typed/npm/moment_v2.3.x.js
+++ /dev/null
@@ -1,331 +0,0 @@
-// flow-typed signature: 23b805356f90ad9384dd88489654e380
-// flow-typed version: e9374c5fe9/moment_v2.3.x/flow_>=v0.25.x
-
-type moment$MomentOptions = {
-  y?: number | string,
-  year?: number | string,
-  years?: number | string,
-  M?: number | string,
-  month?: number | string,
-  months?: number | string,
-  d?: number | string,
-  day?: number | string,
-  days?: number | string,
-  date?: number | string,
-  h?: number | string,
-  hour?: number | string,
-  hours?: number | string,
-  m?: number | string,
-  minute?: number | string,
-  minutes?: number | string,
-  s?: number | string,
-  second?: number | string,
-  seconds?: number | string,
-  ms?: number | string,
-  millisecond?: number | string,
-  milliseconds?: number | string
-};
-
-type moment$MomentObject = {
-  years: number,
-  months: number,
-  date: number,
-  hours: number,
-  minutes: number,
-  seconds: number,
-  milliseconds: number
-};
-
-type moment$MomentCreationData = {
-  input: string,
-  format: string,
-  locale: Object,
-  isUTC: boolean,
-  strict: boolean
-};
-
-type moment$CalendarFormat = string | ((moment: moment$Moment) => string);
-
-type moment$CalendarFormats = {
-  sameDay?: moment$CalendarFormat,
-  nextDay?: moment$CalendarFormat,
-  nextWeek?: moment$CalendarFormat,
-  lastDay?: moment$CalendarFormat,
-  lastWeek?: moment$CalendarFormat,
-  sameElse?: moment$CalendarFormat
-};
-
-declare class moment$LocaleData {
-  months(moment: moment$Moment): string,
-  monthsShort(moment: moment$Moment): string,
-  monthsParse(month: string): number,
-  weekdays(moment: moment$Moment): string,
-  weekdaysShort(moment: moment$Moment): string,
-  weekdaysMin(moment: moment$Moment): string,
-  weekdaysParse(weekDay: string): number,
-  longDateFormat(dateFormat: string): string,
-  isPM(date: string): boolean,
-  meridiem(hours: number, minutes: number, isLower: boolean): string,
-  calendar(
-    key:
-      | "sameDay"
-      | "nextDay"
-      | "lastDay"
-      | "nextWeek"
-      | "prevWeek"
-      | "sameElse",
-    moment: moment$Moment
-  ): string,
-  relativeTime(
-    number: number,
-    withoutSuffix: boolean,
-    key: "s" | "m" | "mm" | "h" | "hh" | "d" | "dd" | "M" | "MM" | "y" | "yy",
-    isFuture: boolean
-  ): string,
-  pastFuture(diff: any, relTime: string): string,
-  ordinal(number: number): string,
-  preparse(str: string): any,
-  postformat(str: string): any,
-  week(moment: moment$Moment): string,
-  invalidDate(): string,
-  firstDayOfWeek(): number,
-  firstDayOfYear(): number
-}
-declare class moment$MomentDuration {
-  humanize(suffix?: boolean): string,
-  milliseconds(): number,
-  asMilliseconds(): number,
-  seconds(): number,
-  asSeconds(): number,
-  minutes(): number,
-  asMinutes(): number,
-  hours(): number,
-  asHours(): number,
-  days(): number,
-  asDays(): number,
-  months(): number,
-  asWeeks(): number,
-  weeks(): number,
-  asMonths(): number,
-  years(): number,
-  asYears(): number,
-  add(value: number | moment$MomentDuration | Object, unit?: string): this,
-  subtract(value: number | moment$MomentDuration | Object, unit?: string): this,
-  as(unit: string): number,
-  get(unit: string): number,
-  toJSON(): string,
-  toISOString(): string,
-  isValid(): boolean
-}
-declare class moment$Moment {
-  static ISO_8601: string,
-  static (
-    string?: string,
-    format?: string | Array<string>,
-    strict?: boolean
-  ): moment$Moment,
-  static (
-    string?: string,
-    format?: string | Array<string>,
-    locale?: string,
-    strict?: boolean
-  ): moment$Moment,
-  static (
-    initDate: ?Object | number | Date | Array<number> | moment$Moment | string
-  ): moment$Moment,
-  static unix(seconds: number): moment$Moment,
-  static utc(): moment$Moment,
-  static utc(number: number | Array<number>): moment$Moment,
-  static utc(
-    str: string,
-    str2?: string | Array<string>,
-    str3?: string
-  ): moment$Moment,
-  static utc(moment: moment$Moment): moment$Moment,
-  static utc(date: Date): moment$Moment,
-  static parseZone(): moment$Moment,
-  static parseZone(rawDate: string): moment$Moment,
-  static parseZone(
-    rawDate: string,
-    format: string | Array<string>
-  ): moment$Moment,
-  static parseZone(
-    rawDate: string,
-    format: string,
-    strict: boolean
-  ): moment$Moment,
-  static parseZone(
-    rawDate: string,
-    format: string,
-    locale: string,
-    strict: boolean
-  ): moment$Moment,
-  isValid(): boolean,
-  invalidAt(): 0 | 1 | 2 | 3 | 4 | 5 | 6,
-  creationData(): moment$MomentCreationData,
-  millisecond(number: number): this,
-  milliseconds(number: number): this,
-  millisecond(): number,
-  milliseconds(): number,
-  second(number: number): this,
-  seconds(number: number): this,
-  second(): number,
-  seconds(): number,
-  minute(number: number): this,
-  minutes(number: number): this,
-  minute(): number,
-  minutes(): number,
-  hour(number: number): this,
-  hours(number: number): this,
-  hour(): number,
-  hours(): number,
-  date(number: number): this,
-  dates(number: number): this,
-  date(): number,
-  dates(): number,
-  day(day: number | string): this,
-  days(day: number | string): this,
-  day(): number,
-  days(): number,
-  weekday(number: number): this,
-  weekday(): number,
-  isoWeekday(number: number): this,
-  isoWeekday(): number,
-  dayOfYear(number: number): this,
-  dayOfYear(): number,
-  week(number: number): this,
-  weeks(number: number): this,
-  week(): number,
-  weeks(): number,
-  isoWeek(number: number): this,
-  isoWeeks(number: number): this,
-  isoWeek(): number,
-  isoWeeks(): number,
-  month(number: number): this,
-  months(number: number): this,
-  month(): number,
-  months(): number,
-  quarter(number: number): this,
-  quarter(): number,
-  year(number: number): this,
-  years(number: number): this,
-  year(): number,
-  years(): number,
-  weekYear(number: number): this,
-  weekYear(): number,
-  isoWeekYear(number: number): this,
-  isoWeekYear(): number,
-  weeksInYear(): number,
-  isoWeeksInYear(): number,
-  get(string: string): number,
-  set(unit: string, value: number): this,
-  set(options: { [unit: string]: number }): this,
-  static max(...dates: Array<moment$Moment>): moment$Moment,
-  static max(dates: Array<moment$Moment>): moment$Moment,
-  static min(...dates: Array<moment$Moment>): moment$Moment,
-  static min(dates: Array<moment$Moment>): moment$Moment,
-  add(
-    value: number | moment$MomentDuration | moment$Moment | Object,
-    unit?: string
-  ): this,
-  subtract(
-    value: number | moment$MomentDuration | moment$Moment | string | Object,
-    unit?: string
-  ): this,
-  startOf(unit: string): this,
-  endOf(unit: string): this,
-  local(): this,
-  utc(): this,
-  utcOffset(
-    offset: number | string,
-    keepLocalTime?: boolean,
-    keepMinutes?: boolean
-  ): this,
-  utcOffset(): number,
-  format(format?: string): string,
-  fromNow(removeSuffix?: boolean): string,
-  from(
-    value: moment$Moment | string | number | Date | Array<number>,
-    removePrefix?: boolean
-  ): string,
-  toNow(removePrefix?: boolean): string,
-  to(
-    value: moment$Moment | string | number | Date | Array<number>,
-    removePrefix?: boolean
-  ): string,
-  calendar(refTime?: any, formats?: moment$CalendarFormats): string,
-  diff(
-    date: moment$Moment | string | number | Date | Array<number>,
-    format?: string,
-    floating?: boolean
-  ): number,
-  valueOf(): number,
-  unix(): number,
-  daysInMonth(): number,
-  toDate(): Date,
-  toArray(): Array<number>,
-  toJSON(): string,
-  toISOString(
-    keepOffset?: boolean
-  ): string,
-  toObject(): moment$MomentObject,
-  isBefore(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isSame(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isAfter(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isSameOrBefore(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isSameOrAfter(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isBetween(
-    fromDate: moment$Moment | string | number | Date | Array<number>,
-    toDate?: ?moment$Moment | string | number | Date | Array<number>,
-    granularity?: ?string,
-    inclusion?: ?string
-  ): boolean,
-  isDST(): boolean,
-  isDSTShifted(): boolean,
-  isLeapYear(): boolean,
-  clone(): moment$Moment,
-  static isMoment(obj: any): boolean,
-  static isDate(obj: any): boolean,
-  static locale(locale: string, localeData?: Object): string,
-  static updateLocale(locale: string, localeData?: ?Object): void,
-  static locale(locales: Array<string>): string,
-  locale(locale: string, customization?: Object | null): moment$Moment,
-  locale(): string,
-  static months(): Array<string>,
-  static monthsShort(): Array<string>,
-  static weekdays(): Array<string>,
-  static weekdaysShort(): Array<string>,
-  static weekdaysMin(): Array<string>,
-  static months(): string,
-  static monthsShort(): string,
-  static weekdays(): string,
-  static weekdaysShort(): string,
-  static weekdaysMin(): string,
-  static localeData(key?: string): moment$LocaleData,
-  static duration(
-    value: number | Object | string,
-    unit?: string
-  ): moment$MomentDuration,
-  static isDuration(obj: any): boolean,
-  static normalizeUnits(unit: string): string,
-  static invalid(object: any): moment$Moment
-}
-
-declare module "moment" {
-  declare module.exports: Class<moment$Moment>;
-}
diff --git a/scm-plugins/scm-hg-plugin/flow-typed/npm/react-jss_vx.x.x.js b/scm-plugins/scm-hg-plugin/flow-typed/npm/react-jss_vx.x.x.js
deleted file mode 100644
index cf8abae155..0000000000
--- a/scm-plugins/scm-hg-plugin/flow-typed/npm/react-jss_vx.x.x.js
+++ /dev/null
@@ -1,137 +0,0 @@
-// flow-typed signature: ba35d02d668b0d0a3e04a63a6847974e
-// flow-typed version: <<STUB>>/react-jss_v8.6.1/flow_v0.79.1
-
-/**
- * This is an autogenerated libdef stub for:
- *
- *   'react-jss'
- *
- * Fill this stub out by replacing all the `any` types.
- *
- * Once filled out, we encourage you to share your work with the
- * community by sending a pull request to:
- * https://github.com/flowtype/flow-typed
- */
-
-declare module 'react-jss' {
-  declare module.exports: any;
-}
-
-/**
- * We include stubs for each file inside this npm package in case you need to
- * require those files directly. Feel free to delete any files that aren't
- * needed.
- */
-declare module 'react-jss/dist/react-jss' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/dist/react-jss.min' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/compose' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/compose.test' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/contextTypes' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/createHoc' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/getDisplayName' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/index' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/index.test' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/injectSheet' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/injectSheet.test' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/jss' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/JssProvider' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/JssProvider.test' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/ns' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/propTypes' {
-  declare module.exports: any;
-}
-
-// Filename aliases
-declare module 'react-jss/dist/react-jss.js' {
-  declare module.exports: $Exports<'react-jss/dist/react-jss'>;
-}
-declare module 'react-jss/dist/react-jss.min.js' {
-  declare module.exports: $Exports<'react-jss/dist/react-jss.min'>;
-}
-declare module 'react-jss/lib/compose.js' {
-  declare module.exports: $Exports<'react-jss/lib/compose'>;
-}
-declare module 'react-jss/lib/compose.test.js' {
-  declare module.exports: $Exports<'react-jss/lib/compose.test'>;
-}
-declare module 'react-jss/lib/contextTypes.js' {
-  declare module.exports: $Exports<'react-jss/lib/contextTypes'>;
-}
-declare module 'react-jss/lib/createHoc.js' {
-  declare module.exports: $Exports<'react-jss/lib/createHoc'>;
-}
-declare module 'react-jss/lib/getDisplayName.js' {
-  declare module.exports: $Exports<'react-jss/lib/getDisplayName'>;
-}
-declare module 'react-jss/lib/index.js' {
-  declare module.exports: $Exports<'react-jss/lib/index'>;
-}
-declare module 'react-jss/lib/index.test.js' {
-  declare module.exports: $Exports<'react-jss/lib/index.test'>;
-}
-declare module 'react-jss/lib/injectSheet.js' {
-  declare module.exports: $Exports<'react-jss/lib/injectSheet'>;
-}
-declare module 'react-jss/lib/injectSheet.test.js' {
-  declare module.exports: $Exports<'react-jss/lib/injectSheet.test'>;
-}
-declare module 'react-jss/lib/jss.js' {
-  declare module.exports: $Exports<'react-jss/lib/jss'>;
-}
-declare module 'react-jss/lib/JssProvider.js' {
-  declare module.exports: $Exports<'react-jss/lib/JssProvider'>;
-}
-declare module 'react-jss/lib/JssProvider.test.js' {
-  declare module.exports: $Exports<'react-jss/lib/JssProvider.test'>;
-}
-declare module 'react-jss/lib/ns.js' {
-  declare module.exports: $Exports<'react-jss/lib/ns'>;
-}
-declare module 'react-jss/lib/propTypes.js' {
-  declare module.exports: $Exports<'react-jss/lib/propTypes'>;
-}
diff --git a/scm-plugins/scm-svn-plugin/.flowconfig b/scm-plugins/scm-svn-plugin/.flowconfig
index 7ede008602..b05e157358 100644
--- a/scm-plugins/scm-svn-plugin/.flowconfig
+++ b/scm-plugins/scm-svn-plugin/.flowconfig
@@ -4,5 +4,6 @@
 [include]
 
 [libs]
+./node_modules/@scm-manager/ui-components/flow-typed
 
 [options]
diff --git a/scm-plugins/scm-svn-plugin/flow-typed/npm/classnames_v2.x.x.js b/scm-plugins/scm-svn-plugin/flow-typed/npm/classnames_v2.x.x.js
deleted file mode 100644
index 2307243eeb..0000000000
--- a/scm-plugins/scm-svn-plugin/flow-typed/npm/classnames_v2.x.x.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// flow-typed signature: cf86673cc32d185bdab1d2ea90578d37
-// flow-typed version: 614bf49aa8/classnames_v2.x.x/flow_>=v0.25.x
-
-type $npm$classnames$Classes =
-  | string
-  | { [className: string]: * }
-  | false
-  | void
-  | null;
-
-declare module "classnames" {
-  declare module.exports: (
-    ...classes: Array<$npm$classnames$Classes | $npm$classnames$Classes[]>
-  ) => string;
-}
-
-declare module "classnames/bind" {
-  declare module.exports: $Exports<"classnames">;
-}
-
-declare module "classnames/dedupe" {
-  declare module.exports: $Exports<"classnames">;
-}
diff --git a/scm-plugins/scm-svn-plugin/flow-typed/npm/jest_v23.x.x.js b/scm-plugins/scm-svn-plugin/flow-typed/npm/jest_v23.x.x.js
deleted file mode 100644
index 23b66b07e5..0000000000
--- a/scm-plugins/scm-svn-plugin/flow-typed/npm/jest_v23.x.x.js
+++ /dev/null
@@ -1,1108 +0,0 @@
-// flow-typed signature: f5a484315a3dea13d273645306e4076a
-// flow-typed version: 7c5d14b3d4/jest_v23.x.x/flow_>=v0.39.x
-
-type JestMockFn<TArguments: $ReadOnlyArray<*>, TReturn> = {
-  (...args: TArguments): TReturn,
-  /**
-   * An object for introspecting mock calls
-   */
-  mock: {
-    /**
-     * An array that represents all calls that have been made into this mock
-     * function. Each call is represented by an array of arguments that were
-     * passed during the call.
-     */
-    calls: Array<TArguments>,
-    /**
-     * An array that contains all the object instances that have been
-     * instantiated from this mock function.
-     */
-    instances: Array<TReturn>
-  },
-  /**
-   * Resets all information stored in the mockFn.mock.calls and
-   * mockFn.mock.instances arrays. Often this is useful when you want to clean
-   * up a mock's usage data between two assertions.
-   */
-  mockClear(): void,
-  /**
-   * Resets all information stored in the mock. This is useful when you want to
-   * completely restore a mock back to its initial state.
-   */
-  mockReset(): void,
-  /**
-   * Removes the mock and restores the initial implementation. This is useful
-   * when you want to mock functions in certain test cases and restore the
-   * original implementation in others. Beware that mockFn.mockRestore only
-   * works when mock was created with jest.spyOn. Thus you have to take care of
-   * restoration yourself when manually assigning jest.fn().
-   */
-  mockRestore(): void,
-  /**
-   * Accepts a function that should be used as the implementation of the mock.
-   * The mock itself will still record all calls that go into and instances
-   * that come from itself -- the only difference is that the implementation
-   * will also be executed when the mock is called.
-   */
-  mockImplementation(
-    fn: (...args: TArguments) => TReturn
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a function that will be used as an implementation of the mock for
-   * one call to the mocked function. Can be chained so that multiple function
-   * calls produce different results.
-   */
-  mockImplementationOnce(
-    fn: (...args: TArguments) => TReturn
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a string to use in test result output in place of "jest.fn()" to
-   * indicate which mock function is being referenced.
-   */
-  mockName(name: string): JestMockFn<TArguments, TReturn>,
-  /**
-   * Just a simple sugar function for returning `this`
-   */
-  mockReturnThis(): void,
-  /**
-   * Accepts a value that will be returned whenever the mock function is called.
-   */
-  mockReturnValue(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for only returning a value once inside your mock
-   */
-  mockReturnValueOnce(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.resolve(value))
-   */
-  mockResolvedValue(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.resolve(value))
-   */
-  mockResolvedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.reject(value))
-   */
-  mockRejectedValue(value: TReturn): JestMockFn<TArguments, Promise<any>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.reject(value))
-   */
-  mockRejectedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<any>>
-};
-
-type JestAsymmetricEqualityType = {
-  /**
-   * A custom Jasmine equality tester
-   */
-  asymmetricMatch(value: mixed): boolean
-};
-
-type JestCallsType = {
-  allArgs(): mixed,
-  all(): mixed,
-  any(): boolean,
-  count(): number,
-  first(): mixed,
-  mostRecent(): mixed,
-  reset(): void
-};
-
-type JestClockType = {
-  install(): void,
-  mockDate(date: Date): void,
-  tick(milliseconds?: number): void,
-  uninstall(): void
-};
-
-type JestMatcherResult = {
-  message?: string | (() => string),
-  pass: boolean
-};
-
-type JestMatcher = (actual: any, expected: any) => JestMatcherResult;
-
-type JestPromiseType = {
-  /**
-   * Use rejects to unwrap the reason of a rejected promise so any other
-   * matcher can be chained. If the promise is fulfilled the assertion fails.
-   */
-  rejects: JestExpectType,
-  /**
-   * Use resolves to unwrap the value of a fulfilled promise so any other
-   * matcher can be chained. If the promise is rejected the assertion fails.
-   */
-  resolves: JestExpectType
-};
-
-/**
- * Jest allows functions and classes to be used as test names in test() and
- * describe()
- */
-type JestTestName = string | Function;
-
-/**
- *  Plugin: jest-styled-components
- */
-
-type JestStyledComponentsMatcherValue =
-  | string
-  | JestAsymmetricEqualityType
-  | RegExp
-  | typeof undefined;
-
-type JestStyledComponentsMatcherOptions = {
-  media?: string;
-  modifier?: string;
-  supports?: string;
-}
-
-type JestStyledComponentsMatchersType = {
-  toHaveStyleRule(
-    property: string,
-    value: JestStyledComponentsMatcherValue,
-    options?: JestStyledComponentsMatcherOptions
-  ): void,
-};
-
-/**
- *  Plugin: jest-enzyme
- */
-type EnzymeMatchersType = {
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmpty(): void,
-  toBeEmptyRender(): void,
-  toBePresent(): void,
-  toContainReact(element: React$Element<any>): void,
-  toExist(): void,
-  toHaveClassName(className: string): void,
-  toHaveHTML(html: string): void,
-  toHaveProp: ((propKey: string, propValue?: any) => void) & ((props: Object) => void),
-  toHaveRef(refName: string): void,
-  toHaveState: ((stateKey: string, stateValue?: any) => void) & ((state: Object) => void),
-  toHaveStyle: ((styleKey: string, styleValue?: any) => void) & ((style: Object) => void),
-  toHaveTagName(tagName: string): void,
-  toHaveText(text: string): void,
-  toIncludeText(text: string): void,
-  toHaveValue(value: any): void,
-  toMatchElement(element: React$Element<any>): void,
-  toMatchSelector(selector: string): void
-};
-
-// DOM testing library extensions https://github.com/kentcdodds/dom-testing-library#custom-jest-matchers
-type DomTestingLibraryType = {
-  toBeInTheDOM(): void,
-  toHaveTextContent(content: string): void,
-  toHaveAttribute(name: string, expectedValue?: string): void
-};
-
-// Jest JQuery Matchers: https://github.com/unindented/custom-jquery-matchers
-type JestJQueryMatchersType = {
-  toExist(): void,
-  toHaveLength(len: number): void,
-  toHaveId(id: string): void,
-  toHaveClass(className: string): void,
-  toHaveTag(tag: string): void,
-  toHaveAttr(key: string, val?: any): void,
-  toHaveProp(key: string, val?: any): void,
-  toHaveText(text: string | RegExp): void,
-  toHaveData(key: string, val?: any): void,
-  toHaveValue(val: any): void,
-  toHaveCss(css: {[key: string]: any}): void,
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmpty(): void,
-  toBeHidden(): void,
-  toBeSelected(): void,
-  toBeVisible(): void,
-  toBeFocused(): void,
-  toBeInDom(): void,
-  toBeMatchedBy(sel: string): void,
-  toHaveDescendant(sel: string): void,
-  toHaveDescendantWithText(sel: string, text: string | RegExp): void
-};
-
-
-// Jest Extended Matchers: https://github.com/jest-community/jest-extended
-type JestExtendedMatchersType = {
-  /**
-     * Note: Currently unimplemented
-     * Passing assertion
-     *
-     * @param {String} message
-     */
-  //  pass(message: string): void;
-
-    /**
-     * Note: Currently unimplemented
-     * Failing assertion
-     *
-     * @param {String} message
-     */
-  //  fail(message: string): void;
-
-    /**
-     * Use .toBeEmpty when checking if a String '', Array [] or Object {} is empty.
-     */
-    toBeEmpty(): void;
-
-    /**
-     * Use .toBeOneOf when checking if a value is a member of a given Array.
-     * @param {Array.<*>} members
-     */
-    toBeOneOf(members: any[]): void;
-
-    /**
-     * Use `.toBeNil` when checking a value is `null` or `undefined`.
-     */
-    toBeNil(): void;
-
-    /**
-     * Use `.toSatisfy` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean`.
-     * @param {Function} predicate
-     */
-    toSatisfy(predicate: (n: any) => boolean): void;
-
-    /**
-     * Use `.toBeArray` when checking if a value is an `Array`.
-     */
-    toBeArray(): void;
-
-    /**
-     * Use `.toBeArrayOfSize` when checking if a value is an `Array` of size x.
-     * @param {Number} x
-     */
-    toBeArrayOfSize(x: number): void;
-
-    /**
-     * Use `.toIncludeAllMembers` when checking if an `Array` contains all of the same members of a given set.
-     * @param {Array.<*>} members
-     */
-    toIncludeAllMembers(members: any[]): void;
-
-    /**
-     * Use `.toIncludeAnyMembers` when checking if an `Array` contains any of the members of a given set.
-     * @param {Array.<*>} members
-     */
-    toIncludeAnyMembers(members: any[]): void;
-
-    /**
-     * Use `.toSatisfyAll` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean` for all values in an array.
-     * @param {Function} predicate
-     */
-    toSatisfyAll(predicate: (n: any) => boolean): void;
-
-    /**
-     * Use `.toBeBoolean` when checking if a value is a `Boolean`.
-     */
-    toBeBoolean(): void;
-
-    /**
-     * Use `.toBeTrue` when checking a value is equal (===) to `true`.
-     */
-    toBeTrue(): void;
-
-    /**
-     * Use `.toBeFalse` when checking a value is equal (===) to `false`.
-     */
-    toBeFalse(): void;
-
-    /**
-     * Use .toBeDate when checking if a value is a Date.
-     */
-    toBeDate(): void;
-
-    /**
-     * Use `.toBeFunction` when checking if a value is a `Function`.
-     */
-    toBeFunction(): void;
-
-    /**
-     * Use `.toHaveBeenCalledBefore` when checking if a `Mock` was called before another `Mock`.
-     *
-     * Note: Required Jest version >22
-     * Note: Your mock functions will have to be asynchronous to cause the timestamps inside of Jest to occur in a differentJS event loop, otherwise the mock timestamps will all be the same
-     *
-     * @param {Mock} mock
-     */
-    toHaveBeenCalledBefore(mock: JestMockFn<any, any>): void;
-
-    /**
-     * Use `.toBeNumber` when checking if a value is a `Number`.
-     */
-    toBeNumber(): void;
-
-    /**
-     * Use `.toBeNaN` when checking a value is `NaN`.
-     */
-    toBeNaN(): void;
-
-    /**
-     * Use `.toBeFinite` when checking if a value is a `Number`, not `NaN` or `Infinity`.
-     */
-    toBeFinite(): void;
-
-    /**
-     * Use `.toBePositive` when checking if a value is a positive `Number`.
-     */
-    toBePositive(): void;
-
-    /**
-     * Use `.toBeNegative` when checking if a value is a negative `Number`.
-     */
-    toBeNegative(): void;
-
-    /**
-     * Use `.toBeEven` when checking if a value is an even `Number`.
-     */
-    toBeEven(): void;
-
-    /**
-     * Use `.toBeOdd` when checking if a value is an odd `Number`.
-     */
-    toBeOdd(): void;
-
-    /**
-     * Use `.toBeWithin` when checking if a number is in between the given bounds of: start (inclusive) and end (exclusive).
-     *
-     * @param {Number} start
-     * @param {Number} end
-     */
-    toBeWithin(start: number, end: number): void;
-
-    /**
-     * Use `.toBeObject` when checking if a value is an `Object`.
-     */
-    toBeObject(): void;
-
-    /**
-     * Use `.toContainKey` when checking if an object contains the provided key.
-     *
-     * @param {String} key
-     */
-    toContainKey(key: string): void;
-
-    /**
-     * Use `.toContainKeys` when checking if an object has all of the provided keys.
-     *
-     * @param {Array.<String>} keys
-     */
-    toContainKeys(keys: string[]): void;
-
-    /**
-     * Use `.toContainAllKeys` when checking if an object only contains all of the provided keys.
-     *
-     * @param {Array.<String>} keys
-     */
-    toContainAllKeys(keys: string[]): void;
-
-    /**
-     * Use `.toContainAnyKeys` when checking if an object contains at least one of the provided keys.
-     *
-     * @param {Array.<String>} keys
-     */
-    toContainAnyKeys(keys: string[]): void;
-
-    /**
-     * Use `.toContainValue` when checking if an object contains the provided value.
-     *
-     * @param {*} value
-     */
-    toContainValue(value: any): void;
-
-    /**
-     * Use `.toContainValues` when checking if an object contains all of the provided values.
-     *
-     * @param {Array.<*>} values
-     */
-    toContainValues(values: any[]): void;
-
-    /**
-     * Use `.toContainAllValues` when checking if an object only contains all of the provided values.
-     *
-     * @param {Array.<*>} values
-     */
-    toContainAllValues(values: any[]): void;
-
-    /**
-     * Use `.toContainAnyValues` when checking if an object contains at least one of the provided values.
-     *
-     * @param {Array.<*>} values
-     */
-    toContainAnyValues(values: any[]): void;
-
-    /**
-     * Use `.toContainEntry` when checking if an object contains the provided entry.
-     *
-     * @param {Array.<String, String>} entry
-     */
-    toContainEntry(entry: [string, string]): void;
-
-    /**
-     * Use `.toContainEntries` when checking if an object contains all of the provided entries.
-     *
-     * @param {Array.<Array.<String, String>>} entries
-     */
-    toContainEntries(entries: [string, string][]): void;
-
-    /**
-     * Use `.toContainAllEntries` when checking if an object only contains all of the provided entries.
-     *
-     * @param {Array.<Array.<String, String>>} entries
-     */
-    toContainAllEntries(entries: [string, string][]): void;
-
-    /**
-     * Use `.toContainAnyEntries` when checking if an object contains at least one of the provided entries.
-     *
-     * @param {Array.<Array.<String, String>>} entries
-     */
-    toContainAnyEntries(entries: [string, string][]): void;
-
-    /**
-     * Use `.toBeExtensible` when checking if an object is extensible.
-     */
-    toBeExtensible(): void;
-
-    /**
-     * Use `.toBeFrozen` when checking if an object is frozen.
-     */
-    toBeFrozen(): void;
-
-    /**
-     * Use `.toBeSealed` when checking if an object is sealed.
-     */
-    toBeSealed(): void;
-
-    /**
-     * Use `.toBeString` when checking if a value is a `String`.
-     */
-    toBeString(): void;
-
-    /**
-     * Use `.toEqualCaseInsensitive` when checking if a string is equal (===) to another ignoring the casing of both strings.
-     *
-     * @param {String} string
-     */
-    toEqualCaseInsensitive(string: string): void;
-
-    /**
-     * Use `.toStartWith` when checking if a `String` starts with a given `String` prefix.
-     *
-     * @param {String} prefix
-     */
-    toStartWith(prefix: string): void;
-
-    /**
-     * Use `.toEndWith` when checking if a `String` ends with a given `String` suffix.
-     *
-     * @param {String} suffix
-     */
-    toEndWith(suffix: string): void;
-
-    /**
-     * Use `.toInclude` when checking if a `String` includes the given `String` substring.
-     *
-     * @param {String} substring
-     */
-    toInclude(substring: string): void;
-
-    /**
-     * Use `.toIncludeRepeated` when checking if a `String` includes the given `String` substring the correct number of times.
-     *
-     * @param {String} substring
-     * @param {Number} times
-     */
-    toIncludeRepeated(substring: string, times: number): void;
-
-    /**
-     * Use `.toIncludeMultiple` when checking if a `String` includes all of the given substrings.
-     *
-     * @param {Array.<String>} substring
-     */
-    toIncludeMultiple(substring: string[]): void;
-};
-
-interface JestExpectType {
-  not:
-    & JestExpectType
-    & EnzymeMatchersType
-    & DomTestingLibraryType
-    & JestJQueryMatchersType
-    & JestStyledComponentsMatchersType
-    & JestExtendedMatchersType,
-  /**
-   * If you have a mock function, you can use .lastCalledWith to test what
-   * arguments it was last called with.
-   */
-  lastCalledWith(...args: Array<any>): void,
-  /**
-   * toBe just checks that a value is what you expect. It uses === to check
-   * strict equality.
-   */
-  toBe(value: any): void,
-  /**
-   * Use .toBeCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toBeCalledWith(...args: Array<any>): void,
-  /**
-   * Using exact equality with floating point numbers is a bad idea. Rounding
-   * means that intuitive things fail.
-   */
-  toBeCloseTo(num: number, delta: any): void,
-  /**
-   * Use .toBeDefined to check that a variable is not undefined.
-   */
-  toBeDefined(): void,
-  /**
-   * Use .toBeFalsy when you don't care what a value is, you just want to
-   * ensure a value is false in a boolean context.
-   */
-  toBeFalsy(): void,
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThan.
-   */
-  toBeGreaterThan(number: number): void,
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThanOrEqual.
-   */
-  toBeGreaterThanOrEqual(number: number): void,
-  /**
-   * To compare floating point numbers, you can use toBeLessThan.
-   */
-  toBeLessThan(number: number): void,
-  /**
-   * To compare floating point numbers, you can use toBeLessThanOrEqual.
-   */
-  toBeLessThanOrEqual(number: number): void,
-  /**
-   * Use .toBeInstanceOf(Class) to check that an object is an instance of a
-   * class.
-   */
-  toBeInstanceOf(cls: Class<*>): void,
-  /**
-   * .toBeNull() is the same as .toBe(null) but the error messages are a bit
-   * nicer.
-   */
-  toBeNull(): void,
-  /**
-   * Use .toBeTruthy when you don't care what a value is, you just want to
-   * ensure a value is true in a boolean context.
-   */
-  toBeTruthy(): void,
-  /**
-   * Use .toBeUndefined to check that a variable is undefined.
-   */
-  toBeUndefined(): void,
-  /**
-   * Use .toContain when you want to check that an item is in a list. For
-   * testing the items in the list, this uses ===, a strict equality check.
-   */
-  toContain(item: any): void,
-  /**
-   * Use .toContainEqual when you want to check that an item is in a list. For
-   * testing the items in the list, this matcher recursively checks the
-   * equality of all fields, rather than checking for object identity.
-   */
-  toContainEqual(item: any): void,
-  /**
-   * Use .toEqual when you want to check that two objects have the same value.
-   * This matcher recursively checks the equality of all fields, rather than
-   * checking for object identity.
-   */
-  toEqual(value: any): void,
-  /**
-   * Use .toHaveBeenCalled to ensure that a mock function got called.
-   */
-  toHaveBeenCalled(): void,
-  toBeCalled(): void;
-  /**
-   * Use .toHaveBeenCalledTimes to ensure that a mock function got called exact
-   * number of times.
-   */
-  toHaveBeenCalledTimes(number: number): void,
-  toBeCalledTimes(number: number): void;
-  /**
-   *
-   */
-  toHaveBeenNthCalledWith(nthCall: number, ...args: Array<any>): void;
-  nthCalledWith(nthCall: number, ...args: Array<any>): void;
-  /**
-   *
-   */
-  toHaveReturned(): void;
-  toReturn(): void;
-  /**
-   *
-   */
-  toHaveReturnedTimes(number: number): void;
-  toReturnTimes(number: number): void;
-  /**
-   *
-   */
-  toHaveReturnedWith(value: any): void;
-  toReturnWith(value: any): void;
-  /**
-   *
-   */
-  toHaveLastReturnedWith(value: any): void;
-  lastReturnedWith(value: any): void;
-  /**
-   *
-   */
-  toHaveNthReturnedWith(nthCall: number, value: any): void;
-  nthReturnedWith(nthCall: number, value: any): void;
-  /**
-   * Use .toHaveBeenCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toHaveBeenCalledWith(...args: Array<any>): void,
-  toBeCalledWith(...args: Array<any>): void,
-  /**
-   * Use .toHaveBeenLastCalledWith to ensure that a mock function was last called
-   * with specific arguments.
-   */
-  toHaveBeenLastCalledWith(...args: Array<any>): void,
-  lastCalledWith(...args: Array<any>): void,
-  /**
-   * Check that an object has a .length property and it is set to a certain
-   * numeric value.
-   */
-  toHaveLength(number: number): void,
-  /**
-   *
-   */
-  toHaveProperty(propPath: string, value?: any): void,
-  /**
-   * Use .toMatch to check that a string matches a regular expression or string.
-   */
-  toMatch(regexpOrString: RegExp | string): void,
-  /**
-   * Use .toMatchObject to check that a javascript object matches a subset of the properties of an object.
-   */
-  toMatchObject(object: Object | Array<Object>): void,
-  /**
-   * Use .toStrictEqual to check that a javascript object matches a subset of the properties of an object.
-   */
-  toStrictEqual(value: any): void,
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(propertyMatchers?: {[key: string]: JestAsymmetricEqualityType}, name?: string): void,
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(name: string): void,
-
-  toMatchInlineSnapshot(snapshot?: string): void,
-  toMatchInlineSnapshot(propertyMatchers?: {[key: string]: JestAsymmetricEqualityType}, snapshot?: string): void,
-  /**
-   * Use .toThrow to test that a function throws when it is called.
-   * If you want to test that a specific error gets thrown, you can provide an
-   * argument to toThrow. The argument can be a string for the error message,
-   * a class for the error, or a regex that should match the error.
-   *
-   * Alias: .toThrowError
-   */
-  toThrow(message?: string | Error | Class<Error> | RegExp): void,
-  toThrowError(message?: string | Error | Class<Error> | RegExp): void,
-  /**
-   * Use .toThrowErrorMatchingSnapshot to test that a function throws a error
-   * matching the most recent snapshot when it is called.
-   */
-  toThrowErrorMatchingSnapshot(): void,
-  toThrowErrorMatchingInlineSnapshot(snapshot?: string): void,
-}
-
-type JestObjectType = {
-  /**
-   *  Disables automatic mocking in the module loader.
-   *
-   *  After this method is called, all `require()`s will return the real
-   *  versions of each module (rather than a mocked version).
-   */
-  disableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of disableAutomock
-   */
-  autoMockOff(): JestObjectType,
-  /**
-   * Enables automatic mocking in the module loader.
-   */
-  enableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of enableAutomock
-   */
-  autoMockOn(): JestObjectType,
-  /**
-   * Clears the mock.calls and mock.instances properties of all mocks.
-   * Equivalent to calling .mockClear() on every mocked function.
-   */
-  clearAllMocks(): JestObjectType,
-  /**
-   * Resets the state of all mocks. Equivalent to calling .mockReset() on every
-   * mocked function.
-   */
-  resetAllMocks(): JestObjectType,
-  /**
-   * Restores all mocks back to their original value.
-   */
-  restoreAllMocks(): JestObjectType,
-  /**
-   * Removes any pending timers from the timer system.
-   */
-  clearAllTimers(): void,
-  /**
-   * The same as `mock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  doMock(moduleName: string, moduleFactory?: any): JestObjectType,
-  /**
-   * The same as `unmock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  dontMock(moduleName: string): JestObjectType,
-  /**
-   * Returns a new, unused mock function. Optionally takes a mock
-   * implementation.
-   */
-  fn<TArguments: $ReadOnlyArray<*>, TReturn>(
-    implementation?: (...args: TArguments) => TReturn
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Determines if the given function is a mocked function.
-   */
-  isMockFunction(fn: Function): boolean,
-  /**
-   * Given the name of a module, use the automatic mocking system to generate a
-   * mocked version of the module for you.
-   */
-  genMockFromModule(moduleName: string): any,
-  /**
-   * Mocks a module with an auto-mocked version when it is being required.
-   *
-   * The second argument can be used to specify an explicit module factory that
-   * is being run instead of using Jest's automocking feature.
-   *
-   * The third argument can be used to create virtual mocks -- mocks of modules
-   * that don't exist anywhere in the system.
-   */
-  mock(
-    moduleName: string,
-    moduleFactory?: any,
-    options?: Object
-  ): JestObjectType,
-  /**
-   * Returns the actual module instead of a mock, bypassing all checks on
-   * whether the module should receive a mock implementation or not.
-   */
-  requireActual(moduleName: string): any,
-  /**
-   * Returns a mock module instead of the actual module, bypassing all checks
-   * on whether the module should be required normally or not.
-   */
-  requireMock(moduleName: string): any,
-  /**
-   * Resets the module registry - the cache of all required modules. This is
-   * useful to isolate modules where local state might conflict between tests.
-   */
-  resetModules(): JestObjectType,
-  /**
-   * Exhausts the micro-task queue (usually interfaced in node via
-   * process.nextTick).
-   */
-  runAllTicks(): void,
-  /**
-   * Exhausts the macro-task queue (i.e., all tasks queued by setTimeout(),
-   * setInterval(), and setImmediate()).
-   */
-  runAllTimers(): void,
-  /**
-   * Exhausts all tasks queued by setImmediate().
-   */
-  runAllImmediates(): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   */
-  advanceTimersByTime(msToRun: number): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   *
-   * Renamed to `advanceTimersByTime`.
-   */
-  runTimersToTime(msToRun: number): void,
-  /**
-   * Executes only the macro-tasks that are currently pending (i.e., only the
-   * tasks that have been queued by setTimeout() or setInterval() up to this
-   * point)
-   */
-  runOnlyPendingTimers(): void,
-  /**
-   * Explicitly supplies the mock object that the module system should return
-   * for the specified module. Note: It is recommended to use jest.mock()
-   * instead.
-   */
-  setMock(moduleName: string, moduleExports: any): JestObjectType,
-  /**
-   * Indicates that the module system should never return a mocked version of
-   * the specified module from require() (e.g. that it should always return the
-   * real module).
-   */
-  unmock(moduleName: string): JestObjectType,
-  /**
-   * Instructs Jest to use fake versions of the standard timer functions
-   * (setTimeout, setInterval, clearTimeout, clearInterval, nextTick,
-   * setImmediate and clearImmediate).
-   */
-  useFakeTimers(): JestObjectType,
-  /**
-   * Instructs Jest to use the real versions of the standard timer functions.
-   */
-  useRealTimers(): JestObjectType,
-  /**
-   * Creates a mock function similar to jest.fn but also tracks calls to
-   * object[methodName].
-   */
-  spyOn(object: Object, methodName: string, accessType?: "get" | "set"): JestMockFn<any, any>,
-  /**
-   * Set the default timeout interval for tests and before/after hooks in milliseconds.
-   * Note: The default timeout interval is 5 seconds if this method is not called.
-   */
-  setTimeout(timeout: number): JestObjectType
-};
-
-type JestSpyType = {
-  calls: JestCallsType
-};
-
-/** Runs this function after every test inside this context */
-declare function afterEach(
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-/** Runs this function before every test inside this context */
-declare function beforeEach(
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-/** Runs this function after all tests have finished inside this context */
-declare function afterAll(
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-/** Runs this function before any tests have started inside this context */
-declare function beforeAll(
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-
-/** A context for grouping tests together */
-declare var describe: {
-  /**
-   * Creates a block that groups together several related tests in one "test suite"
-   */
-  (name: JestTestName, fn: () => void): void,
-
-  /**
-   * Only run this describe block
-   */
-  only(name: JestTestName, fn: () => void): void,
-
-  /**
-   * Skip running this describe block
-   */
-  skip(name: JestTestName, fn: () => void): void
-};
-
-/** An individual test unit */
-declare var it: {
-  /**
-   * An individual test unit
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  (
-    name: JestTestName,
-    fn?: (done: () => void) => ?Promise<mixed>,
-    timeout?: number
-  ): void,
-  /**
-   * each runs this test against array of argument arrays per each run
-   *
-   * @param {table} table of Test
-   */
-  each(
-    table: Array<Array<mixed>>
-  ): (
-    name: JestTestName,
-    fn?: (...args: Array<any>) => ?Promise<mixed>
-  ) => void,
-  /**
-   * Only run this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  only(
-    name: JestTestName,
-    fn?: (done: () => void) => ?Promise<mixed>,
-    timeout?: number
-  ): {
-    each(
-      table: Array<Array<mixed>>
-    ): (
-      name: JestTestName,
-      fn?: (...args: Array<any>) => ?Promise<mixed>
-    ) => void,
-  },
-  /**
-   * Skip running this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  skip(
-    name: JestTestName,
-    fn?: (done: () => void) => ?Promise<mixed>,
-    timeout?: number
-  ): void,
-  /**
-   * Run the test concurrently
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  concurrent(
-    name: JestTestName,
-    fn?: (done: () => void) => ?Promise<mixed>,
-    timeout?: number
-  ): void
-};
-declare function fit(
-  name: JestTestName,
-  fn: (done: () => void) => ?Promise<mixed>,
-  timeout?: number
-): void;
-/** An individual test unit */
-declare var test: typeof it;
-/** A disabled group of tests */
-declare var xdescribe: typeof describe;
-/** A focused group of tests */
-declare var fdescribe: typeof describe;
-/** A disabled individual test */
-declare var xit: typeof it;
-/** A disabled individual test */
-declare var xtest: typeof it;
-
-type JestPrettyFormatColors = {
-  comment: { close: string, open: string },
-  content: { close: string, open: string },
-  prop: { close: string, open: string },
-  tag: { close: string, open: string },
-  value: { close: string, open: string },
-};
-
-type JestPrettyFormatIndent = string => string;
-type JestPrettyFormatRefs = Array<any>;
-type JestPrettyFormatPrint = any => string;
-type JestPrettyFormatStringOrNull = string | null;
-
-type JestPrettyFormatOptions = {|
-  callToJSON: boolean,
-  edgeSpacing: string,
-  escapeRegex: boolean,
-  highlight: boolean,
-  indent: number,
-  maxDepth: number,
-  min: boolean,
-  plugins: JestPrettyFormatPlugins,
-  printFunctionName: boolean,
-  spacing: string,
-  theme: {|
-    comment: string,
-    content: string,
-    prop: string,
-    tag: string,
-    value: string,
-  |},
-|};
-
-type JestPrettyFormatPlugin = {
-  print: (
-    val: any,
-    serialize: JestPrettyFormatPrint,
-    indent: JestPrettyFormatIndent,
-    opts: JestPrettyFormatOptions,
-    colors: JestPrettyFormatColors,
-  ) => string,
-  test: any => boolean,
-};
-
-type JestPrettyFormatPlugins = Array<JestPrettyFormatPlugin>;
-
-/** The expect function is used every time you want to test a value */
-declare var expect: {
-  /** The object that you want to make assertions against */
-  (value: any):
-    & JestExpectType
-    & JestPromiseType
-    & EnzymeMatchersType
-    & DomTestingLibraryType
-    & JestJQueryMatchersType
-    & JestStyledComponentsMatchersType
-    & JestExtendedMatchersType,
-
-  /** Add additional Jasmine matchers to Jest's roster */
-  extend(matchers: { [name: string]: JestMatcher }): void,
-  /** Add a module that formats application-specific data structures. */
-  addSnapshotSerializer(pluginModule: JestPrettyFormatPlugin): void,
-  assertions(expectedAssertions: number): void,
-  hasAssertions(): void,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  objectContaining(value: Object): Object,
-  /** Matches any received string that contains the exact expected string. */
-  stringContaining(value: string): string,
-  stringMatching(value: string | RegExp): string,
-  not: {
-    arrayContaining: (value: $ReadOnlyArray<mixed>) => Array<mixed>,
-    objectContaining: (value: {}) => Object,
-    stringContaining: (value: string) => string,
-    stringMatching: (value: string | RegExp) => string,
-  },
-};
-
-// TODO handle return type
-// http://jasmine.github.io/2.4/introduction.html#section-Spies
-declare function spyOn(value: mixed, method: string): Object;
-
-/** Holds all functions related to manipulating test runner */
-declare var jest: JestObjectType;
-
-/**
- * The global Jasmine object, this is generally not exposed as the public API,
- * using features inside here could break in later versions of Jest.
- */
-declare var jasmine: {
-  DEFAULT_TIMEOUT_INTERVAL: number,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  clock(): JestClockType,
-  createSpy(name: string): JestSpyType,
-  createSpyObj(
-    baseName: string,
-    methodNames: Array<string>
-  ): { [methodName: string]: JestSpyType },
-  objectContaining(value: Object): Object,
-  stringMatching(value: string): string
-};
diff --git a/scm-plugins/scm-svn-plugin/flow-typed/npm/moment_v2.3.x.js b/scm-plugins/scm-svn-plugin/flow-typed/npm/moment_v2.3.x.js
deleted file mode 100644
index c2786e87fd..0000000000
--- a/scm-plugins/scm-svn-plugin/flow-typed/npm/moment_v2.3.x.js
+++ /dev/null
@@ -1,331 +0,0 @@
-// flow-typed signature: 23b805356f90ad9384dd88489654e380
-// flow-typed version: e9374c5fe9/moment_v2.3.x/flow_>=v0.25.x
-
-type moment$MomentOptions = {
-  y?: number | string,
-  year?: number | string,
-  years?: number | string,
-  M?: number | string,
-  month?: number | string,
-  months?: number | string,
-  d?: number | string,
-  day?: number | string,
-  days?: number | string,
-  date?: number | string,
-  h?: number | string,
-  hour?: number | string,
-  hours?: number | string,
-  m?: number | string,
-  minute?: number | string,
-  minutes?: number | string,
-  s?: number | string,
-  second?: number | string,
-  seconds?: number | string,
-  ms?: number | string,
-  millisecond?: number | string,
-  milliseconds?: number | string
-};
-
-type moment$MomentObject = {
-  years: number,
-  months: number,
-  date: number,
-  hours: number,
-  minutes: number,
-  seconds: number,
-  milliseconds: number
-};
-
-type moment$MomentCreationData = {
-  input: string,
-  format: string,
-  locale: Object,
-  isUTC: boolean,
-  strict: boolean
-};
-
-type moment$CalendarFormat = string | ((moment: moment$Moment) => string);
-
-type moment$CalendarFormats = {
-  sameDay?: moment$CalendarFormat,
-  nextDay?: moment$CalendarFormat,
-  nextWeek?: moment$CalendarFormat,
-  lastDay?: moment$CalendarFormat,
-  lastWeek?: moment$CalendarFormat,
-  sameElse?: moment$CalendarFormat
-};
-
-declare class moment$LocaleData {
-  months(moment: moment$Moment): string,
-  monthsShort(moment: moment$Moment): string,
-  monthsParse(month: string): number,
-  weekdays(moment: moment$Moment): string,
-  weekdaysShort(moment: moment$Moment): string,
-  weekdaysMin(moment: moment$Moment): string,
-  weekdaysParse(weekDay: string): number,
-  longDateFormat(dateFormat: string): string,
-  isPM(date: string): boolean,
-  meridiem(hours: number, minutes: number, isLower: boolean): string,
-  calendar(
-    key:
-      | "sameDay"
-      | "nextDay"
-      | "lastDay"
-      | "nextWeek"
-      | "prevWeek"
-      | "sameElse",
-    moment: moment$Moment
-  ): string,
-  relativeTime(
-    number: number,
-    withoutSuffix: boolean,
-    key: "s" | "m" | "mm" | "h" | "hh" | "d" | "dd" | "M" | "MM" | "y" | "yy",
-    isFuture: boolean
-  ): string,
-  pastFuture(diff: any, relTime: string): string,
-  ordinal(number: number): string,
-  preparse(str: string): any,
-  postformat(str: string): any,
-  week(moment: moment$Moment): string,
-  invalidDate(): string,
-  firstDayOfWeek(): number,
-  firstDayOfYear(): number
-}
-declare class moment$MomentDuration {
-  humanize(suffix?: boolean): string,
-  milliseconds(): number,
-  asMilliseconds(): number,
-  seconds(): number,
-  asSeconds(): number,
-  minutes(): number,
-  asMinutes(): number,
-  hours(): number,
-  asHours(): number,
-  days(): number,
-  asDays(): number,
-  months(): number,
-  asWeeks(): number,
-  weeks(): number,
-  asMonths(): number,
-  years(): number,
-  asYears(): number,
-  add(value: number | moment$MomentDuration | Object, unit?: string): this,
-  subtract(value: number | moment$MomentDuration | Object, unit?: string): this,
-  as(unit: string): number,
-  get(unit: string): number,
-  toJSON(): string,
-  toISOString(): string,
-  isValid(): boolean
-}
-declare class moment$Moment {
-  static ISO_8601: string,
-  static (
-    string?: string,
-    format?: string | Array<string>,
-    strict?: boolean
-  ): moment$Moment,
-  static (
-    string?: string,
-    format?: string | Array<string>,
-    locale?: string,
-    strict?: boolean
-  ): moment$Moment,
-  static (
-    initDate: ?Object | number | Date | Array<number> | moment$Moment | string
-  ): moment$Moment,
-  static unix(seconds: number): moment$Moment,
-  static utc(): moment$Moment,
-  static utc(number: number | Array<number>): moment$Moment,
-  static utc(
-    str: string,
-    str2?: string | Array<string>,
-    str3?: string
-  ): moment$Moment,
-  static utc(moment: moment$Moment): moment$Moment,
-  static utc(date: Date): moment$Moment,
-  static parseZone(): moment$Moment,
-  static parseZone(rawDate: string): moment$Moment,
-  static parseZone(
-    rawDate: string,
-    format: string | Array<string>
-  ): moment$Moment,
-  static parseZone(
-    rawDate: string,
-    format: string,
-    strict: boolean
-  ): moment$Moment,
-  static parseZone(
-    rawDate: string,
-    format: string,
-    locale: string,
-    strict: boolean
-  ): moment$Moment,
-  isValid(): boolean,
-  invalidAt(): 0 | 1 | 2 | 3 | 4 | 5 | 6,
-  creationData(): moment$MomentCreationData,
-  millisecond(number: number): this,
-  milliseconds(number: number): this,
-  millisecond(): number,
-  milliseconds(): number,
-  second(number: number): this,
-  seconds(number: number): this,
-  second(): number,
-  seconds(): number,
-  minute(number: number): this,
-  minutes(number: number): this,
-  minute(): number,
-  minutes(): number,
-  hour(number: number): this,
-  hours(number: number): this,
-  hour(): number,
-  hours(): number,
-  date(number: number): this,
-  dates(number: number): this,
-  date(): number,
-  dates(): number,
-  day(day: number | string): this,
-  days(day: number | string): this,
-  day(): number,
-  days(): number,
-  weekday(number: number): this,
-  weekday(): number,
-  isoWeekday(number: number): this,
-  isoWeekday(): number,
-  dayOfYear(number: number): this,
-  dayOfYear(): number,
-  week(number: number): this,
-  weeks(number: number): this,
-  week(): number,
-  weeks(): number,
-  isoWeek(number: number): this,
-  isoWeeks(number: number): this,
-  isoWeek(): number,
-  isoWeeks(): number,
-  month(number: number): this,
-  months(number: number): this,
-  month(): number,
-  months(): number,
-  quarter(number: number): this,
-  quarter(): number,
-  year(number: number): this,
-  years(number: number): this,
-  year(): number,
-  years(): number,
-  weekYear(number: number): this,
-  weekYear(): number,
-  isoWeekYear(number: number): this,
-  isoWeekYear(): number,
-  weeksInYear(): number,
-  isoWeeksInYear(): number,
-  get(string: string): number,
-  set(unit: string, value: number): this,
-  set(options: { [unit: string]: number }): this,
-  static max(...dates: Array<moment$Moment>): moment$Moment,
-  static max(dates: Array<moment$Moment>): moment$Moment,
-  static min(...dates: Array<moment$Moment>): moment$Moment,
-  static min(dates: Array<moment$Moment>): moment$Moment,
-  add(
-    value: number | moment$MomentDuration | moment$Moment | Object,
-    unit?: string
-  ): this,
-  subtract(
-    value: number | moment$MomentDuration | moment$Moment | string | Object,
-    unit?: string
-  ): this,
-  startOf(unit: string): this,
-  endOf(unit: string): this,
-  local(): this,
-  utc(): this,
-  utcOffset(
-    offset: number | string,
-    keepLocalTime?: boolean,
-    keepMinutes?: boolean
-  ): this,
-  utcOffset(): number,
-  format(format?: string): string,
-  fromNow(removeSuffix?: boolean): string,
-  from(
-    value: moment$Moment | string | number | Date | Array<number>,
-    removePrefix?: boolean
-  ): string,
-  toNow(removePrefix?: boolean): string,
-  to(
-    value: moment$Moment | string | number | Date | Array<number>,
-    removePrefix?: boolean
-  ): string,
-  calendar(refTime?: any, formats?: moment$CalendarFormats): string,
-  diff(
-    date: moment$Moment | string | number | Date | Array<number>,
-    format?: string,
-    floating?: boolean
-  ): number,
-  valueOf(): number,
-  unix(): number,
-  daysInMonth(): number,
-  toDate(): Date,
-  toArray(): Array<number>,
-  toJSON(): string,
-  toISOString(
-    keepOffset?: boolean
-  ): string,
-  toObject(): moment$MomentObject,
-  isBefore(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isSame(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isAfter(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isSameOrBefore(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isSameOrAfter(
-    date?: moment$Moment | string | number | Date | Array<number>,
-    units?: ?string
-  ): boolean,
-  isBetween(
-    fromDate: moment$Moment | string | number | Date | Array<number>,
-    toDate?: ?moment$Moment | string | number | Date | Array<number>,
-    granularity?: ?string,
-    inclusion?: ?string
-  ): boolean,
-  isDST(): boolean,
-  isDSTShifted(): boolean,
-  isLeapYear(): boolean,
-  clone(): moment$Moment,
-  static isMoment(obj: any): boolean,
-  static isDate(obj: any): boolean,
-  static locale(locale: string, localeData?: Object): string,
-  static updateLocale(locale: string, localeData?: ?Object): void,
-  static locale(locales: Array<string>): string,
-  locale(locale: string, customization?: Object | null): moment$Moment,
-  locale(): string,
-  static months(): Array<string>,
-  static monthsShort(): Array<string>,
-  static weekdays(): Array<string>,
-  static weekdaysShort(): Array<string>,
-  static weekdaysMin(): Array<string>,
-  static months(): string,
-  static monthsShort(): string,
-  static weekdays(): string,
-  static weekdaysShort(): string,
-  static weekdaysMin(): string,
-  static localeData(key?: string): moment$LocaleData,
-  static duration(
-    value: number | Object | string,
-    unit?: string
-  ): moment$MomentDuration,
-  static isDuration(obj: any): boolean,
-  static normalizeUnits(unit: string): string,
-  static invalid(object: any): moment$Moment
-}
-
-declare module "moment" {
-  declare module.exports: Class<moment$Moment>;
-}
diff --git a/scm-plugins/scm-svn-plugin/flow-typed/npm/react-jss_vx.x.x.js b/scm-plugins/scm-svn-plugin/flow-typed/npm/react-jss_vx.x.x.js
deleted file mode 100644
index cf8abae155..0000000000
--- a/scm-plugins/scm-svn-plugin/flow-typed/npm/react-jss_vx.x.x.js
+++ /dev/null
@@ -1,137 +0,0 @@
-// flow-typed signature: ba35d02d668b0d0a3e04a63a6847974e
-// flow-typed version: <<STUB>>/react-jss_v8.6.1/flow_v0.79.1
-
-/**
- * This is an autogenerated libdef stub for:
- *
- *   'react-jss'
- *
- * Fill this stub out by replacing all the `any` types.
- *
- * Once filled out, we encourage you to share your work with the
- * community by sending a pull request to:
- * https://github.com/flowtype/flow-typed
- */
-
-declare module 'react-jss' {
-  declare module.exports: any;
-}
-
-/**
- * We include stubs for each file inside this npm package in case you need to
- * require those files directly. Feel free to delete any files that aren't
- * needed.
- */
-declare module 'react-jss/dist/react-jss' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/dist/react-jss.min' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/compose' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/compose.test' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/contextTypes' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/createHoc' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/getDisplayName' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/index' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/index.test' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/injectSheet' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/injectSheet.test' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/jss' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/JssProvider' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/JssProvider.test' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/ns' {
-  declare module.exports: any;
-}
-
-declare module 'react-jss/lib/propTypes' {
-  declare module.exports: any;
-}
-
-// Filename aliases
-declare module 'react-jss/dist/react-jss.js' {
-  declare module.exports: $Exports<'react-jss/dist/react-jss'>;
-}
-declare module 'react-jss/dist/react-jss.min.js' {
-  declare module.exports: $Exports<'react-jss/dist/react-jss.min'>;
-}
-declare module 'react-jss/lib/compose.js' {
-  declare module.exports: $Exports<'react-jss/lib/compose'>;
-}
-declare module 'react-jss/lib/compose.test.js' {
-  declare module.exports: $Exports<'react-jss/lib/compose.test'>;
-}
-declare module 'react-jss/lib/contextTypes.js' {
-  declare module.exports: $Exports<'react-jss/lib/contextTypes'>;
-}
-declare module 'react-jss/lib/createHoc.js' {
-  declare module.exports: $Exports<'react-jss/lib/createHoc'>;
-}
-declare module 'react-jss/lib/getDisplayName.js' {
-  declare module.exports: $Exports<'react-jss/lib/getDisplayName'>;
-}
-declare module 'react-jss/lib/index.js' {
-  declare module.exports: $Exports<'react-jss/lib/index'>;
-}
-declare module 'react-jss/lib/index.test.js' {
-  declare module.exports: $Exports<'react-jss/lib/index.test'>;
-}
-declare module 'react-jss/lib/injectSheet.js' {
-  declare module.exports: $Exports<'react-jss/lib/injectSheet'>;
-}
-declare module 'react-jss/lib/injectSheet.test.js' {
-  declare module.exports: $Exports<'react-jss/lib/injectSheet.test'>;
-}
-declare module 'react-jss/lib/jss.js' {
-  declare module.exports: $Exports<'react-jss/lib/jss'>;
-}
-declare module 'react-jss/lib/JssProvider.js' {
-  declare module.exports: $Exports<'react-jss/lib/JssProvider'>;
-}
-declare module 'react-jss/lib/JssProvider.test.js' {
-  declare module.exports: $Exports<'react-jss/lib/JssProvider.test'>;
-}
-declare module 'react-jss/lib/ns.js' {
-  declare module.exports: $Exports<'react-jss/lib/ns'>;
-}
-declare module 'react-jss/lib/propTypes.js' {
-  declare module.exports: $Exports<'react-jss/lib/propTypes'>;
-}

From f34ea4ece1297d715c5dfa1811412353dc68877d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 26 Oct 2018 09:47:30 +0200
Subject: [PATCH 030/188] Let validation error dto inherit from 'normal' error

---
 .../scm/api/v2/ValidationExceptionMapper.java | 22 ++++++++++++-------
 .../sonia/scm/api/v2/resources/ErrorDto.java  |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java
index c6af6b8921..8cd2c6d649 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java
@@ -2,6 +2,8 @@ package sonia.scm.api.v2;
 
 import lombok.Getter;
 import org.jboss.resteasy.api.validation.ResteasyViolationException;
+import org.slf4j.MDC;
+import sonia.scm.api.v2.resources.ErrorDto;
 
 import javax.validation.ConstraintViolation;
 import javax.ws.rs.core.MediaType;
@@ -11,46 +13,50 @@ import javax.ws.rs.ext.Provider;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static java.util.Collections.emptyList;
+
 @Provider
 public class ValidationExceptionMapper implements ExceptionMapper<ResteasyViolationException> {
 
   @Override
   public Response toResponse(ResteasyViolationException exception) {
 
-    List<ConstraintViolationBean> violations =
+    List<ConstraintViolationDto> violations =
       exception.getConstraintViolations()
         .stream()
-        .map(ConstraintViolationBean::new)
+        .map(ConstraintViolationDto::new)
         .collect(Collectors.toList());
 
     return Response
       .status(Response.Status.BAD_REQUEST)
       .type(MediaType.APPLICATION_JSON_TYPE)
-      .entity(new ValidationError(violations))
+      .entity(new ValidationErrorDto(violations))
       .build();
   }
 
   @Getter
-  public static class ValidationError {
+  public static class ValidationErrorDto extends ErrorDto {
     @XmlElement(name = "violation")
     @XmlElementWrapper(name = "violations")
-    private List<ConstraintViolationBean> violations;
+    private List<ConstraintViolationDto> violations;
 
-    public ValidationError(List<ConstraintViolationBean> violations) {
+    public ValidationErrorDto(List<ConstraintViolationDto> violations) {
+      super(MDC.get("transaction_id"), "1wR7ZBe7H1", emptyList(), "input violates conditions (see violation list)");
       this.violations = violations;
     }
   }
 
   @XmlRootElement(name = "violation")
   @Getter
-  public static class ConstraintViolationBean {
+  public static class ConstraintViolationDto {
     private String path;
     private String message;
 
-    public ConstraintViolationBean(ConstraintViolation<?> violation) {
+    public ConstraintViolationDto(ConstraintViolation<?> violation) {
       message = violation.getMessage();
       path = violation.getPropertyPath().toString();
     }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
index 48aa158451..df8a33684b 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
@@ -18,7 +18,7 @@ public class ErrorDto {
   @JsonInclude(JsonInclude.Include.NON_NULL)
   private final String url;
 
-  private ErrorDto(String transactionId, String errorCode, List<ContextEntry> context, String message) {
+  protected ErrorDto(String transactionId, String errorCode, List<ContextEntry> context, String message) {
     this(transactionId, errorCode, context, message, null);
   }
   private ErrorDto(String transactionId, String errorCode, List<ContextEntry> context, String message, String url) {

From 1b89859128a6ae117a1ddd5a6e1248de77a4c440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 26 Oct 2018 12:46:13 +0200
Subject: [PATCH 031/188] Name parameters for validation

---
 .../v2/resources/GroupCollectionResource.java |  3 +-
 .../scm/api/v2/resources/GroupResource.java   |  3 +-
 .../scm/api/v2/resources/MeResource.java      |  3 +-
 .../v2/resources/PermissionRootResource.java  |  5 ++--
 .../RepositoryCollectionResource.java         |  3 +-
 .../api/v2/resources/RepositoryResource.java  |  3 +-
 .../ResourceParameterNameProvider.java        | 29 +++++++++++++++++++
 .../v2/resources/UserCollectionResource.java  |  3 +-
 .../scm/api/v2/resources/UserResource.java    |  5 ++--
 .../main/resources/META-INF/validation.xml    | 14 +++++++++
 10 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceParameterNameProvider.java
 create mode 100644 scm-webapp/src/main/resources/META-INF/validation.xml

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
index d845aa181e..0683a1d17b 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
@@ -10,6 +10,7 @@ import sonia.scm.group.GroupManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DefaultValue;
@@ -85,7 +86,7 @@ public class GroupCollectionResource {
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   @ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created group"))
-  public Response create(@Valid GroupDto groupDto) {
+  public Response create(@Valid @Named("group") GroupDto groupDto) {
     return adapter.create(groupDto,
                           () -> dtoToGroupMapper.map(groupDto),
                           group -> resourceLinks.group().self(group.getName()));
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java
index f2341262ce..88954212f6 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java
@@ -8,6 +8,7 @@ import sonia.scm.group.GroupManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -96,7 +97,7 @@ public class GroupResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
-  public Response update(@PathParam("id") String name, @Valid GroupDto groupDto) {
+  public Response update(@PathParam("id") String name, @Valid @Named("group") GroupDto groupDto) {
     return adapter.update(name, existing -> dtoToGroupMapper.map(groupDto));
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeResource.java
index f616aff852..62917da8b0 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeResource.java
@@ -10,6 +10,7 @@ import sonia.scm.user.UserManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -73,7 +74,7 @@ public class MeResource {
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   @Consumes(VndMediaType.PASSWORD_CHANGE)
-  public Response changePassword(@Valid PasswordChangeDto passwordChangeDto) {
+  public Response changePassword(@Valid @Named("passwordChange") PasswordChangeDto passwordChangeDto) {
     userManager.changePasswordForLoggedInUser(passwordService.encryptPassword(passwordChangeDto.getOldPassword()), passwordService.encryptPassword(passwordChangeDto.getNewPassword()));
     return Response.noContent().build();
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
index c997a706fd..9359746f1e 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
@@ -15,6 +15,7 @@ import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -73,7 +74,7 @@ public class PermissionRootResource {
   @TypeHint(TypeHint.NO_CONTENT.class)
   @Consumes(VndMediaType.PERMISSION)
   @Path("")
-  public Response create(@PathParam("namespace") String namespace, @PathParam("name") String name,@Valid PermissionDto permission) {
+  public Response create(@PathParam("namespace") String namespace, @PathParam("name") String name,@Valid @Named("permission") PermissionDto permission) {
     log.info("try to add new permission: {}", permission);
     Repository repository = load(namespace, name);
     RepositoryPermissions.permissionWrite(repository).check();
@@ -160,7 +161,7 @@ public class PermissionRootResource {
   public Response update(@PathParam("namespace") String namespace,
                          @PathParam("name") String name,
                          @PathParam("permission-name") String permissionName,
-                         @Valid PermissionDto permission) {
+                         @Valid @Named("permission") PermissionDto permission) {
     log.info("try to update the permission with name: {}. the modified permission is: {}", permissionName, permission);
     Repository repository = load(namespace, name);
     RepositoryPermissions.permissionWrite(repository).check();
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
index 665e2131d9..d109714ebe 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
@@ -10,6 +10,7 @@ import sonia.scm.repository.RepositoryManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DefaultValue;
@@ -86,7 +87,7 @@ public class RepositoryCollectionResource {
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   @ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created repository"))
-  public Response create(@Valid RepositoryDto repositoryDto) {
+  public Response create(@Valid @Named("repository") RepositoryDto repositoryDto) {
     return adapter.create(repositoryDto,
       () -> dtoToRepositoryMapper.map(repositoryDto, null),
       repository -> resourceLinks.repository().self(repository.getNamespace(), repository.getName()));
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
index 141cf64ff6..75615784ba 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
@@ -10,6 +10,7 @@ import sonia.scm.repository.RepositoryManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.inject.Provider;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
@@ -139,7 +140,7 @@ public class RepositoryResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
-  public Response update(@PathParam("namespace") String namespace, @PathParam("name") String name, @Valid RepositoryDto repositoryDto) {
+  public Response update(@PathParam("namespace") String namespace, @PathParam("name") String name, @Valid @Named("repository") RepositoryDto repositoryDto) {
     return adapter.update(
       loadBy(namespace, name),
       existing -> processUpdate(repositoryDto, existing),
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceParameterNameProvider.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceParameterNameProvider.java
new file mode 100644
index 0000000000..986a3ca652
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceParameterNameProvider.java
@@ -0,0 +1,29 @@
+package sonia.scm.api.v2.resources;
+
+import javax.inject.Named;
+import javax.validation.ParameterNameProvider;
+import javax.ws.rs.ext.Provider;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@Provider
+public class ResourceParameterNameProvider implements ParameterNameProvider {
+  @Override
+  public List<String> getParameterNames(Constructor<?> constructor) {
+    return Arrays.stream(constructor.getParameters()).map(this::getParameterName).collect(Collectors.toList());
+  }
+
+  @Override
+  public List<String> getParameterNames(Method method) {
+    return Arrays.stream(method.getParameters()).map(this::getParameterName).collect(Collectors.toList());
+  }
+
+  private String getParameterName(Parameter parameter) {
+    return Optional.ofNullable(parameter.getAnnotation(Named.class)).map(Named::value).orElse(parameter.getName());
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
index e7a49bc1fd..c19e6b35ba 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
@@ -11,6 +11,7 @@ import sonia.scm.user.UserManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DefaultValue;
@@ -90,7 +91,7 @@ public class UserCollectionResource {
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   @ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created user"))
-  public Response create(@Valid UserDto userDto) {
+  public Response create(@Valid @Named("user") UserDto userDto) {
     return adapter.create(userDto, () -> dtoToUserMapper.map(userDto, passwordService.encryptPassword(userDto.getPassword())), user -> resourceLinks.user().self(user.getName()));
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
index d0ce8c8a63..565cc48eb9 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
@@ -9,6 +9,7 @@ import sonia.scm.user.UserManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -100,7 +101,7 @@ public class UserResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
-  public Response update(@PathParam("id") String name, @Valid UserDto userDto) {
+  public Response update(@PathParam("id") String name, @Valid @Named("user") UserDto userDto) {
     return adapter.update(name, existing -> dtoToUserMapper.map(userDto, existing.getPassword()));
   }
 
@@ -127,7 +128,7 @@ public class UserResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
-  public Response overwritePassword(@PathParam("id") String name, @Valid PasswordOverwriteDto passwordOverwriteDto) {
+  public Response overwritePassword(@PathParam("id") String name, @Valid @Named("passwordChange") PasswordOverwriteDto passwordOverwriteDto) {
     userManager.overwritePassword(name, passwordService.encryptPassword(passwordOverwriteDto.getNewPassword()));
     return Response.noContent().build();
   }
diff --git a/scm-webapp/src/main/resources/META-INF/validation.xml b/scm-webapp/src/main/resources/META-INF/validation.xml
new file mode 100644
index 0000000000..b6feda4713
--- /dev/null
+++ b/scm-webapp/src/main/resources/META-INF/validation.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<validation-config
+  xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="
+                    http://jboss.org/xml/ns/javax/validation/configuration
+                    validation-configuration-1.1.xsd"
+  version="1.1">
+  <default-provider>org.hibernate.validator.HibernateValidator</default-provider>
+  <message-interpolator>org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator</message-interpolator>
+  <traversable-resolver>org.hibernate.validator.internal.engine.resolver.DefaultTraversableResolver</traversable-resolver>
+  <constraint-validator-factory>org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorFactoryImpl</constraint-validator-factory>
+  <parameter-name-provider>sonia.scm.api.v2.resources.ResourceParameterNameProvider</parameter-name-provider>
+</validation-config>

From cd0964d850ebbc6ed6c29bf7423f6dba728277ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 26 Oct 2018 13:07:41 +0200
Subject: [PATCH 032/188] Fix typo in class name

---
 ...erException.java => NotSupportedFeatureException.java} | 6 +++---
 .../sonia/scm/repository/AbstractRepositoryHandler.java   | 8 ++++----
 .../main/java/sonia/scm/repository/RepositoryHandler.java | 6 +++---
 .../scm/api/rest/resources/RepositoryImportResource.java  | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename scm-core/src/main/java/sonia/scm/{NotSupportedFeatuerException.java => NotSupportedFeatureException.java} (92%)

diff --git a/scm-core/src/main/java/sonia/scm/NotSupportedFeatuerException.java b/scm-core/src/main/java/sonia/scm/NotSupportedFeatureException.java
similarity index 92%
rename from scm-core/src/main/java/sonia/scm/NotSupportedFeatuerException.java
rename to scm-core/src/main/java/sonia/scm/NotSupportedFeatureException.java
index e6fea6cfa7..2270ed37b3 100644
--- a/scm-core/src/main/java/sonia/scm/NotSupportedFeatuerException.java
+++ b/scm-core/src/main/java/sonia/scm/NotSupportedFeatureException.java
@@ -38,7 +38,7 @@ package sonia.scm;
  * @author Sebastian Sdorra
  * @version 1.6
  */
-public class NotSupportedFeatuerException extends Exception
+public class NotSupportedFeatureException extends Exception
 {
 
   /** Field description */
@@ -50,7 +50,7 @@ public class NotSupportedFeatuerException extends Exception
    * Constructs ...
    *
    */
-  public NotSupportedFeatuerException() {}
+  public NotSupportedFeatureException() {}
 
   /**
    * Constructs ...
@@ -58,7 +58,7 @@ public class NotSupportedFeatuerException extends Exception
    *
    * @param message
    */
-  public NotSupportedFeatuerException(String message)
+  public NotSupportedFeatureException(String message)
   {
     super(message);
   }
diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
index 33b6cb8030..a545aefdc8 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
@@ -38,7 +38,7 @@ package sonia.scm.repository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import sonia.scm.NotSupportedFeatuerException;
+import sonia.scm.NotSupportedFeatureException;
 import sonia.scm.SCMContextProvider;
 import sonia.scm.event.ScmEventBus;
 
@@ -165,12 +165,12 @@ public abstract class AbstractRepositoryHandler<C extends RepositoryConfig>
    *
    * @return
    *
-   * @throws NotSupportedFeatuerException
+   * @throws NotSupportedFeatureException
    */
   @Override
-  public ImportHandler getImportHandler() throws NotSupportedFeatuerException
+  public ImportHandler getImportHandler() throws NotSupportedFeatureException
   {
-    throw new NotSupportedFeatuerException(
+    throw new NotSupportedFeatureException(
       "import handler is not supported by this repository handler");
   }
 
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java
index 445fc22ab8..79c06d03f9 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java
@@ -36,7 +36,7 @@ package sonia.scm.repository;
 //~--- non-JDK imports --------------------------------------------------------
 
 import sonia.scm.Handler;
-import sonia.scm.NotSupportedFeatuerException;
+import sonia.scm.NotSupportedFeatureException;
 import sonia.scm.plugin.ExtensionPoint;
 
 /**
@@ -70,9 +70,9 @@ public interface RepositoryHandler
    * @return {@link ImportHandler} for the repository type of this handler
    * @since 1.12
    *
-   * @throws NotSupportedFeatuerException
+   * @throws NotSupportedFeatureException
    */
-  public ImportHandler getImportHandler() throws NotSupportedFeatuerException;
+  public ImportHandler getImportHandler() throws NotSupportedFeatureException;
 
   /**
    * Returns informations about the version of the RepositoryHandler.
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
index 178756f0f9..6bf6c8e803 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
@@ -46,7 +46,7 @@ import org.apache.shiro.SecurityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.NotFoundException;
-import sonia.scm.NotSupportedFeatuerException;
+import sonia.scm.NotSupportedFeatureException;
 import sonia.scm.Type;
 import sonia.scm.api.rest.RestActionUploadResult;
 import sonia.scm.api.v2.resources.RepositoryResource;
@@ -394,7 +394,7 @@ public class RepositoryImportResource
 
         response = Response.ok(result).build();
       }
-      catch (NotSupportedFeatuerException ex)
+      catch (NotSupportedFeatureException ex)
       {
         logger
           .warn(
@@ -609,7 +609,7 @@ public class RepositoryImportResource
             types.add(t);
           }
         }
-        catch (NotSupportedFeatuerException ex)
+        catch (NotSupportedFeatureException ex)
         {
           if (logger.isTraceEnabled())
           {
@@ -711,7 +711,7 @@ public class RepositoryImportResource
           }
         }
       }
-      catch (NotSupportedFeatuerException ex)
+      catch (NotSupportedFeatureException ex)
       {
         throw new WebApplicationException(ex, Response.Status.BAD_REQUEST);
       }

From 9279bfca5f5a3706b2bedb1bbc7a5be0d18fdcda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 26 Oct 2018 14:20:19 +0200
Subject: [PATCH 033/188] Use mappers for errors

---
 .../rest/AlreadyExistsExceptionMapper.java    | 14 ++---
 ...ConcurrentModificationExceptionMapper.java | 10 ++--
 .../api/rest/ContextualExceptionMapper.java   | 36 +++++++++++++
 .../scm/api/v2/NotFoundExceptionMapper.java   | 11 ++--
 .../scm/api/v2/ValidationExceptionMapper.java | 50 +++--------------
 .../sonia/scm/api/v2/resources/ErrorDto.java  | 40 +++++++-------
 .../ExceptionWithContextToErrorDtoMapper.java | 23 ++++++++
 .../scm/api/v2/resources/MapperModule.java    |  3 ++
 .../ViolationExceptionToErrorDtoMapper.java   | 54 +++++++++++++++++++
 9 files changed, 151 insertions(+), 90 deletions(-)
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/ExceptionWithContextToErrorDtoMapper.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/ViolationExceptionToErrorDtoMapper.java

diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/AlreadyExistsExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/AlreadyExistsExceptionMapper.java
index f923eef693..1718d09e9b 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/AlreadyExistsExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/AlreadyExistsExceptionMapper.java
@@ -1,21 +1,13 @@
 package sonia.scm.api.rest;
 
 import sonia.scm.AlreadyExistsException;
-import sonia.scm.api.v2.resources.ErrorDto;
-import sonia.scm.web.VndMediaType;
 
-import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
 @Provider
-public class AlreadyExistsExceptionMapper implements ExceptionMapper<AlreadyExistsException> {
-  @Override
-  public Response toResponse(AlreadyExistsException exception) {
-    return Response.status(Status.CONFLICT)
-      .entity(ErrorDto.from(exception))
-      .type(VndMediaType.ERROR_TYPE)
-      .build();
+public class AlreadyExistsExceptionMapper extends ContextualExceptionMapper<AlreadyExistsException> {
+  public AlreadyExistsExceptionMapper() {
+    super(AlreadyExistsException.class, Status.CONFLICT);
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/ConcurrentModificationExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/ConcurrentModificationExceptionMapper.java
index 49aed6a29a..ed2160f8fb 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/ConcurrentModificationExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/ConcurrentModificationExceptionMapper.java
@@ -1,17 +1,13 @@
 package sonia.scm.api.rest;
 
 import sonia.scm.ConcurrentModificationException;
-import sonia.scm.api.v2.resources.ErrorDto;
-import sonia.scm.web.VndMediaType;
 
 import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
 @Provider
-public class ConcurrentModificationExceptionMapper implements ExceptionMapper<ConcurrentModificationException> {
-  @Override
-  public Response toResponse(ConcurrentModificationException exception) {
-    return Response.status(Response.Status.CONFLICT).entity(ErrorDto.from(exception)).type(VndMediaType.ERROR_TYPE).build();
+public class ConcurrentModificationExceptionMapper extends ContextualExceptionMapper<ConcurrentModificationException> {
+  public ConcurrentModificationExceptionMapper() {
+    super(ConcurrentModificationException.class, Response.Status.CONFLICT);
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
new file mode 100644
index 0000000000..7aee62575a
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
@@ -0,0 +1,36 @@
+package sonia.scm.api.rest;
+
+import com.google.inject.Inject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sonia.scm.ExceptionWithContext;
+import sonia.scm.api.v2.resources.ExceptionWithContextToErrorDtoMapper;
+import sonia.scm.web.VndMediaType;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+public class ContextualExceptionMapper<E extends Throwable & ExceptionWithContext> implements ExceptionMapper<E> {
+
+  @Inject
+  private ExceptionWithContextToErrorDtoMapper mapper;
+
+  private static final Logger logger = LoggerFactory.getLogger(ContextualExceptionMapper.class);
+
+  private final Response.Status status;
+  private final Class<E> type;
+
+  public ContextualExceptionMapper(Class<E> type, Response.Status status) {
+    this.type = type;
+    this.status = status;
+  }
+
+  @Override
+  public Response toResponse(E exception) {
+    logger.debug("map {} to status code {}", type.getSimpleName(), status.getStatusCode());
+    return Response.status(status)
+      .entity(mapper.map(exception))
+      .type(VndMediaType.ERROR_TYPE)
+      .build();
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/NotFoundExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/NotFoundExceptionMapper.java
index c1f046620a..add41bc3b2 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/NotFoundExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/NotFoundExceptionMapper.java
@@ -32,20 +32,17 @@ package sonia.scm.api.v2;
 
 
 import sonia.scm.NotFoundException;
-import sonia.scm.api.v2.resources.ErrorDto;
-import sonia.scm.web.VndMediaType;
+import sonia.scm.api.rest.ContextualExceptionMapper;
 
 import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
 /**
  * @since 2.0.0
  */
 @Provider
-public class NotFoundExceptionMapper implements ExceptionMapper<NotFoundException> {
-  @Override
-  public Response toResponse(NotFoundException exception) {
-    return Response.status(Response.Status.NOT_FOUND).entity(ErrorDto.from(exception)).type(VndMediaType.ERROR_TYPE).build();
+public class NotFoundExceptionMapper extends ContextualExceptionMapper<NotFoundException> {
+  public NotFoundExceptionMapper() {
+    super(NotFoundException.class, Response.Status.NOT_FOUND);
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java
index 8cd2c6d649..4926ed0f66 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java
@@ -1,64 +1,26 @@
 package sonia.scm.api.v2;
 
-import lombok.Getter;
+import com.google.inject.Inject;
 import org.jboss.resteasy.api.validation.ResteasyViolationException;
-import org.slf4j.MDC;
-import sonia.scm.api.v2.resources.ErrorDto;
+import sonia.scm.api.v2.resources.ViolationExceptionToErrorDtoMapper;
 
-import javax.validation.ConstraintViolation;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static java.util.Collections.emptyList;
 
 @Provider
 public class ValidationExceptionMapper implements ExceptionMapper<ResteasyViolationException> {
 
+  @Inject
+  private ViolationExceptionToErrorDtoMapper mapper;
+
   @Override
   public Response toResponse(ResteasyViolationException exception) {
-
-    List<ConstraintViolationDto> violations =
-      exception.getConstraintViolations()
-        .stream()
-        .map(ConstraintViolationDto::new)
-        .collect(Collectors.toList());
-
     return Response
       .status(Response.Status.BAD_REQUEST)
       .type(MediaType.APPLICATION_JSON_TYPE)
-      .entity(new ValidationErrorDto(violations))
+      .entity(mapper.map(exception))
       .build();
   }
-
-  @Getter
-  public static class ValidationErrorDto extends ErrorDto {
-    @XmlElement(name = "violation")
-    @XmlElementWrapper(name = "violations")
-    private List<ConstraintViolationDto> violations;
-
-    public ValidationErrorDto(List<ConstraintViolationDto> violations) {
-      super(MDC.get("transaction_id"), "1wR7ZBe7H1", emptyList(), "input violates conditions (see violation list)");
-      this.violations = violations;
-    }
-  }
-
-  @XmlRootElement(name = "violation")
-  @Getter
-  public static class ConstraintViolationDto {
-    private String path;
-    private String message;
-
-    public ConstraintViolationDto(ConstraintViolation<?> violation) {
-      message = violation.getMessage();
-      path = violation.getPropertyPath().toString();
-    }
-  }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
index df8a33684b..f0df654866 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
@@ -2,34 +2,32 @@ package sonia.scm.api.v2.resources;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
-import org.slf4j.MDC;
+import lombok.Setter;
 import sonia.scm.ContextEntry;
-import sonia.scm.ExceptionWithContext;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 
-@Getter
+@Getter @Setter
 public class ErrorDto {
-  private final String transactionId;
-  private final String errorCode;
-  private final List<ContextEntry> context;
-  private final String message;
+  private String transactionId;
+  private String errorCode;
+  private List<ContextEntry> context;
+  private String message;
+
+  @XmlElement(name = "violation")
+  @XmlElementWrapper(name = "violations")
+  private List<ConstraintViolationDto> violations;
 
   @JsonInclude(JsonInclude.Include.NON_NULL)
-  private final String url;
+  private String url;
 
-  protected ErrorDto(String transactionId, String errorCode, List<ContextEntry> context, String message) {
-    this(transactionId, errorCode, context, message, null);
-  }
-  private ErrorDto(String transactionId, String errorCode, List<ContextEntry> context, String message, String url) {
-    this.transactionId = transactionId;
-    this.errorCode = errorCode;
-    this.context = context;
-    this.message = message;
-    this.url = url;
-  }
-
-  public static ErrorDto from(ExceptionWithContext exception) {
-    return new ErrorDto(MDC.get("transaction_id"), exception.getCode(), exception.getContext(), exception.getMessage());
+  @XmlRootElement(name = "violation")
+  @Getter @Setter
+  public static class ConstraintViolationDto {
+    private String path;
+    private String message;
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ExceptionWithContextToErrorDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ExceptionWithContextToErrorDtoMapper.java
new file mode 100644
index 0000000000..cdd545542a
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ExceptionWithContextToErrorDtoMapper.java
@@ -0,0 +1,23 @@
+package sonia.scm.api.v2.resources;
+
+import org.mapstruct.AfterMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingTarget;
+import org.slf4j.MDC;
+import sonia.scm.ExceptionWithContext;
+
+@Mapper
+public abstract class ExceptionWithContextToErrorDtoMapper {
+
+  @Mapping(target = "errorCode", source = "code")
+  @Mapping(target = "transactionId", ignore = true)
+  @Mapping(target = "violations", ignore = true)
+  @Mapping(target = "url", ignore = true)
+  public abstract ErrorDto map(ExceptionWithContext exception);
+
+  @AfterMapping
+  void setTransactionId(@MappingTarget ErrorDto dto) {
+    dto.setTransactionId(MDC.get("transaction_id"));
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
index 6497cb9315..35f58cef90 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
@@ -39,6 +39,9 @@ public class MapperModule extends AbstractModule {
 
     bind(ReducedObjectModelToDtoMapper.class).to(Mappers.getMapper(ReducedObjectModelToDtoMapper.class).getClass());
 
+    bind(ViolationExceptionToErrorDtoMapper.class).to(Mappers.getMapper(ViolationExceptionToErrorDtoMapper.class).getClass());
+    bind(ExceptionWithContextToErrorDtoMapper.class).to(Mappers.getMapper(ExceptionWithContextToErrorDtoMapper.class).getClass());
+
     // no mapstruct required
     bind(UIPluginDtoMapper.class);
     bind(UIPluginDtoCollectionMapper.class);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ViolationExceptionToErrorDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ViolationExceptionToErrorDtoMapper.java
new file mode 100644
index 0000000000..e713b031f7
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ViolationExceptionToErrorDtoMapper.java
@@ -0,0 +1,54 @@
+package sonia.scm.api.v2.resources;
+
+import org.jboss.resteasy.api.validation.ResteasyViolationException;
+import org.mapstruct.AfterMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingTarget;
+import org.slf4j.MDC;
+
+import javax.validation.ConstraintViolation;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Mapper
+public abstract class ViolationExceptionToErrorDtoMapper {
+
+  @Mapping(target = "errorCode", ignore = true)
+  @Mapping(target = "transactionId", ignore = true)
+  @Mapping(target = "context", ignore = true)
+  @Mapping(target = "url", ignore = true)
+  public abstract ErrorDto map(ResteasyViolationException exception);
+
+  @AfterMapping
+  void setTransactionId(@MappingTarget ErrorDto dto) {
+    dto.setTransactionId(MDC.get("transaction_id"));
+  }
+
+  @AfterMapping
+  void mapViolations(ResteasyViolationException exception, @MappingTarget ErrorDto dto) {
+    List<ErrorDto.ConstraintViolationDto> violations =
+      exception.getConstraintViolations()
+        .stream()
+        .map(this::createViolationDto)
+        .collect(Collectors.toList());
+    dto.setViolations(violations);
+  }
+
+  private ErrorDto.ConstraintViolationDto createViolationDto(ConstraintViolation<?> violation) {
+    ErrorDto.ConstraintViolationDto constraintViolationDto = new ErrorDto.ConstraintViolationDto();
+    constraintViolationDto.setMessage(violation.getMessage());
+    constraintViolationDto.setPath(violation.getPropertyPath().toString());
+    return constraintViolationDto;
+  }
+
+  @AfterMapping
+  void setErrorCode(@MappingTarget ErrorDto dto) {
+    dto.setErrorCode("1wR7ZBe7H1");
+  }
+
+  @AfterMapping
+  void setMessage(@MappingTarget ErrorDto dto) {
+    dto.setMessage("input violates conditions (see violation list)");
+  }
+}

From 22069914b0ff7046fad7cd65803a4acae6bf674e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 26 Oct 2018 14:54:55 +0200
Subject: [PATCH 034/188] Fix injection for unit tests

---
 .../sonia/scm/api/rest/AlreadyExistsExceptionMapper.java | 7 +++++--
 .../api/rest/ConcurrentModificationExceptionMapper.java  | 7 +++++--
 .../sonia/scm/api/rest/ContextualExceptionMapper.java    | 8 ++++----
 .../java/sonia/scm/api/v2/NotFoundExceptionMapper.java   | 7 +++++--
 .../scm/api/v2/resources/ChangesetRootResourceTest.java  | 7 +++----
 .../sonia/scm/api/v2/resources/DiffResourceTest.java     | 4 +++-
 .../java/sonia/scm/api/v2/resources/DispatcherMock.java  | 7 ++++---
 .../scm/api/v2/resources/FileHistoryResourceTest.java    | 9 +++------
 .../scm/api/v2/resources/GroupRootResourceTest.java      | 2 +-
 .../scm/api/v2/resources/ModificationsResourceTest.java  | 8 +++-----
 10 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/AlreadyExistsExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/AlreadyExistsExceptionMapper.java
index 1718d09e9b..65e4426fde 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/AlreadyExistsExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/AlreadyExistsExceptionMapper.java
@@ -1,13 +1,16 @@
 package sonia.scm.api.rest;
 
 import sonia.scm.AlreadyExistsException;
+import sonia.scm.api.v2.resources.ExceptionWithContextToErrorDtoMapper;
 
+import javax.inject.Inject;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.Provider;
 
 @Provider
 public class AlreadyExistsExceptionMapper extends ContextualExceptionMapper<AlreadyExistsException> {
-  public AlreadyExistsExceptionMapper() {
-    super(AlreadyExistsException.class, Status.CONFLICT);
+  @Inject
+  public AlreadyExistsExceptionMapper(ExceptionWithContextToErrorDtoMapper mapper) {
+    super(AlreadyExistsException.class, Status.CONFLICT, mapper);
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/ConcurrentModificationExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/ConcurrentModificationExceptionMapper.java
index ed2160f8fb..edcb48c91b 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/ConcurrentModificationExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/ConcurrentModificationExceptionMapper.java
@@ -1,13 +1,16 @@
 package sonia.scm.api.rest;
 
 import sonia.scm.ConcurrentModificationException;
+import sonia.scm.api.v2.resources.ExceptionWithContextToErrorDtoMapper;
 
+import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.Provider;
 
 @Provider
 public class ConcurrentModificationExceptionMapper extends ContextualExceptionMapper<ConcurrentModificationException> {
-  public ConcurrentModificationExceptionMapper() {
-    super(ConcurrentModificationException.class, Response.Status.CONFLICT);
+  @Inject
+  public ConcurrentModificationExceptionMapper(ExceptionWithContextToErrorDtoMapper mapper) {
+    super(ConcurrentModificationException.class, Response.Status.CONFLICT, mapper);
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
index 7aee62575a..b25af05d50 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
@@ -12,15 +12,15 @@ import javax.ws.rs.ext.ExceptionMapper;
 
 public class ContextualExceptionMapper<E extends Throwable & ExceptionWithContext> implements ExceptionMapper<E> {
 
-  @Inject
-  private ExceptionWithContextToErrorDtoMapper mapper;
-
   private static final Logger logger = LoggerFactory.getLogger(ContextualExceptionMapper.class);
 
+  private ExceptionWithContextToErrorDtoMapper mapper;
+
   private final Response.Status status;
   private final Class<E> type;
 
-  public ContextualExceptionMapper(Class<E> type, Response.Status status) {
+  public ContextualExceptionMapper(Class<E> type, Response.Status status, ExceptionWithContextToErrorDtoMapper mapper) {
+    this.mapper = mapper;
     this.type = type;
     this.status = status;
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/NotFoundExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/NotFoundExceptionMapper.java
index add41bc3b2..944ec276ce 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/NotFoundExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/NotFoundExceptionMapper.java
@@ -33,7 +33,9 @@ package sonia.scm.api.v2;
 
 import sonia.scm.NotFoundException;
 import sonia.scm.api.rest.ContextualExceptionMapper;
+import sonia.scm.api.v2.resources.ExceptionWithContextToErrorDtoMapper;
 
+import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.Provider;
 
@@ -42,7 +44,8 @@ import javax.ws.rs.ext.Provider;
  */
 @Provider
 public class NotFoundExceptionMapper extends ContextualExceptionMapper<NotFoundException> {
-  public NotFoundExceptionMapper() {
-    super(NotFoundException.class, Response.Status.NOT_FOUND);
+  @Inject
+  public NotFoundExceptionMapper(ExceptionWithContextToErrorDtoMapper mapper) {
+    super(NotFoundException.class, Response.Status.NOT_FOUND, mapper);
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
index 098ec40c3f..c8ba5e1fab 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
@@ -51,7 +51,8 @@ public class ChangesetRootResourceTest extends RepositoryTestBase {
 
   public static final String CHANGESET_PATH = "space/repo/changesets/";
   public static final String CHANGESET_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + CHANGESET_PATH;
-  private final Dispatcher dispatcher = MockDispatcherFactory.createDispatcher();
+
+  private Dispatcher dispatcher;
 
   private final URI baseUri = URI.create("/");
   private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
@@ -82,12 +83,10 @@ public class ChangesetRootResourceTest extends RepositoryTestBase {
     changesetCollectionToDtoMapper = new ChangesetCollectionToDtoMapper(changesetToChangesetDtoMapper, resourceLinks);
     changesetRootResource = new ChangesetRootResource(serviceFactory, changesetCollectionToDtoMapper, changesetToChangesetDtoMapper);
     super.changesetRootResource = Providers.of(changesetRootResource);
-    dispatcher.getRegistry().addSingletonResource(getRepositoryRootResource());
+    dispatcher = DispatcherMock.createDispatcher(getRepositoryRootResource());
     when(serviceFactory.create(new NamespaceAndName("space", "repo"))).thenReturn(repositoryService);
     when(serviceFactory.create(any(Repository.class))).thenReturn(repositoryService);
     when(repositoryService.getRepository()).thenReturn(new Repository("repoId", "git", "space", "repo"));
-    dispatcher.getProviderFactory().registerProvider(NotFoundExceptionMapper.class);
-    dispatcher.getProviderFactory().registerProvider(AuthorizationExceptionMapper.class);
     when(repositoryService.getLogCommand()).thenReturn(logCommandBuilder);
     subjectThreadState.bind();
     ThreadContext.bind(subject);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
index f1a1c3b441..516b2ff15c 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
@@ -19,6 +19,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.NotFoundException;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
+import sonia.scm.api.rest.ContextualExceptionMapper;
 import sonia.scm.api.v2.NotFoundExceptionMapper;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
@@ -69,7 +70,8 @@ public class DiffResourceTest extends RepositoryTestBase {
     when(serviceFactory.create(new NamespaceAndName("space", "repo"))).thenReturn(service);
     when(serviceFactory.create(any(Repository.class))).thenReturn(service);
     when(service.getRepository()).thenReturn(new Repository("repoId", "git", "space", "repo"));
-    dispatcher.getProviderFactory().registerProvider(NotFoundExceptionMapper.class);
+    ExceptionWithContextToErrorDtoMapperImpl mapper = new ExceptionWithContextToErrorDtoMapperImpl();
+    dispatcher.getProviderFactory().register(new NotFoundExceptionMapper(mapper));
     dispatcher.getProviderFactory().registerProvider(AuthorizationExceptionMapper.class);
     dispatcher.getProviderFactory().registerProvider(CRLFInjectionExceptionMapper.class);
     when(service.getDiffCommand()).thenReturn(diffCommandBuilder);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
index 7dff9f5ff0..9c34549d34 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
@@ -12,10 +12,11 @@ public class DispatcherMock {
   public static Dispatcher createDispatcher(Object resource) {
     Dispatcher dispatcher = MockDispatcherFactory.createDispatcher();
     dispatcher.getRegistry().addSingletonResource(resource);
-    dispatcher.getProviderFactory().registerProvider(NotFoundExceptionMapper.class);
-    dispatcher.getProviderFactory().registerProvider(AlreadyExistsExceptionMapper.class);
+    ExceptionWithContextToErrorDtoMapperImpl mapper = new ExceptionWithContextToErrorDtoMapperImpl();
+    dispatcher.getProviderFactory().register(new NotFoundExceptionMapper(mapper));
+    dispatcher.getProviderFactory().register(new AlreadyExistsExceptionMapper(mapper));
+    dispatcher.getProviderFactory().register(new ConcurrentModificationExceptionMapper(mapper));
     dispatcher.getProviderFactory().registerProvider(AuthorizationExceptionMapper.class);
-    dispatcher.getProviderFactory().registerProvider(ConcurrentModificationExceptionMapper.class);
     dispatcher.getProviderFactory().registerProvider(InternalRepositoryExceptionMapper.class);
     dispatcher.getProviderFactory().registerProvider(ChangePasswordNotAllowedExceptionMapper.class);
     dispatcher.getProviderFactory().registerProvider(InvalidPasswordExceptionMapper.class);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
index 2963f5d813..3898ac07e0 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
@@ -52,7 +52,6 @@ public class FileHistoryResourceTest extends RepositoryTestBase {
 
   public static final String FILE_HISTORY_PATH = "space/repo/history/";
   public static final String FILE_HISTORY_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + FILE_HISTORY_PATH;
-  private final Dispatcher dispatcher = MockDispatcherFactory.createDispatcher();
 
   private final URI baseUri = URI.create("/");
   private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
@@ -73,23 +72,21 @@ public class FileHistoryResourceTest extends RepositoryTestBase {
 
   private FileHistoryRootResource fileHistoryRootResource;
 
+  private Dispatcher dispatcher;
 
   private final Subject subject = mock(Subject.class);
   private final ThreadState subjectThreadState = new SubjectThreadState(subject);
 
-
   @Before
   public void prepareEnvironment() {
     fileHistoryCollectionToDtoMapper = new FileHistoryCollectionToDtoMapper(changesetToChangesetDtoMapper, resourceLinks);
     fileHistoryRootResource = new FileHistoryRootResource(serviceFactory, fileHistoryCollectionToDtoMapper);
     super.fileHistoryRootResource = Providers.of(fileHistoryRootResource);
-    dispatcher.getRegistry().addSingletonResource(getRepositoryRootResource());
+    dispatcher = DispatcherMock.createDispatcher(getRepositoryRootResource());
     when(serviceFactory.create(new NamespaceAndName("space", "repo"))).thenReturn(service);
     when(serviceFactory.create(any(Repository.class))).thenReturn(service);
     when(service.getRepository()).thenReturn(new Repository("repoId", "git", "space", "repo"));
-    dispatcher.getProviderFactory().registerProvider(NotFoundExceptionMapper.class);
-    dispatcher.getProviderFactory().registerProvider(AuthorizationExceptionMapper.class);
-    dispatcher.getProviderFactory().registerProvider(InternalRepositoryExceptionMapper.class);
+    ExceptionWithContextToErrorDtoMapperImpl mapper = new ExceptionWithContextToErrorDtoMapperImpl();
     when(service.getLogCommand()).thenReturn(logCommandBuilder);
     subjectThreadState.bind();
     ThreadContext.bind(subject);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java
index 036579e9dd..f28cf49d03 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java
@@ -62,7 +62,7 @@ public class GroupRootResourceTest {
   private ArgumentCaptor<Group> groupCaptor = ArgumentCaptor.forClass(Group.class);
 
   @Before
-  public void prepareEnvironment() throws Exception {
+  public void prepareEnvironment() {
     initMocks(this);
     when(groupManager.create(groupCaptor.capture())).thenAnswer(invocation -> invocation.getArguments()[0]);
     doNothing().when(groupManager).modify(groupCaptor.capture());
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
index 0377fe0942..b3eacf314e 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
@@ -46,7 +46,8 @@ public class ModificationsResourceTest extends RepositoryTestBase {
 
   public static final String MODIFICATIONS_PATH = "space/repo/modifications/";
   public static final String MODIFICATIONS_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + MODIFICATIONS_PATH;
-  private final Dispatcher dispatcher = MockDispatcherFactory.createDispatcher();
+
+  private Dispatcher dispatcher;
 
   private final URI baseUri = URI.create("/");
   private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
@@ -74,13 +75,10 @@ public class ModificationsResourceTest extends RepositoryTestBase {
   public void prepareEnvironment() throws Exception {
     modificationsRootResource = new ModificationsRootResource(serviceFactory, modificationsToDtoMapper);
     super.modificationsRootResource = Providers.of(modificationsRootResource);
-    dispatcher.getRegistry().addSingletonResource(getRepositoryRootResource());
+    dispatcher = DispatcherMock.createDispatcher(getRepositoryRootResource());
     when(serviceFactory.create(new NamespaceAndName("space", "repo"))).thenReturn(repositoryService);
     when(serviceFactory.create(any(Repository.class))).thenReturn(repositoryService);
     when(repositoryService.getRepository()).thenReturn(new Repository("repoId", "git", "space", "repo"));
-    dispatcher.getProviderFactory().registerProvider(NotFoundExceptionMapper.class);
-    dispatcher.getProviderFactory().registerProvider(AuthorizationExceptionMapper.class);
-    dispatcher.getProviderFactory().registerProvider(InternalRepositoryExceptionMapper.class);
     when(repositoryService.getModificationsCommand()).thenReturn(modificationsCommandBuilder);
     subjectThreadState.bind();
     ThreadContext.bind(subject);

From f6fe299bb1fa11c287ac5f0246ede9f25bc4f497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 26 Oct 2018 14:59:26 +0200
Subject: [PATCH 035/188] Use constructor injection

---
 .../java/sonia/scm/api/v2/ValidationExceptionMapper.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java
index 4926ed0f66..6fadce8500 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java
@@ -1,9 +1,9 @@
 package sonia.scm.api.v2;
 
-import com.google.inject.Inject;
 import org.jboss.resteasy.api.validation.ResteasyViolationException;
 import sonia.scm.api.v2.resources.ViolationExceptionToErrorDtoMapper;
 
+import javax.inject.Inject;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -12,8 +12,12 @@ import javax.ws.rs.ext.Provider;
 @Provider
 public class ValidationExceptionMapper implements ExceptionMapper<ResteasyViolationException> {
 
+  private final ViolationExceptionToErrorDtoMapper mapper;
+
   @Inject
-  private ViolationExceptionToErrorDtoMapper mapper;
+  public ValidationExceptionMapper(ViolationExceptionToErrorDtoMapper mapper) {
+    this.mapper = mapper;
+  }
 
   @Override
   public Response toResponse(ResteasyViolationException exception) {

From 4a307379a2effeca2f42a0b6c4c938386702abf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 26 Oct 2018 15:15:51 +0200
Subject: [PATCH 036/188] Remove code duplication

---
 .../java/sonia/scm/AlreadyExistsException.java | 12 ++----------
 .../scm/ConcurrentModificationException.java   | 12 ++----------
 .../java/sonia/scm/ExceptionWithContext.java   | 18 ++++++++++++++----
 .../main/java/sonia/scm/NotFoundException.java | 16 ++--------------
 .../api/rest/ContextualExceptionMapper.java    |  3 +--
 5 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/AlreadyExistsException.java b/scm-core/src/main/java/sonia/scm/AlreadyExistsException.java
index 17863c364c..3ca8335346 100644
--- a/scm-core/src/main/java/sonia/scm/AlreadyExistsException.java
+++ b/scm-core/src/main/java/sonia/scm/AlreadyExistsException.java
@@ -3,15 +3,12 @@ package sonia.scm;
 import java.util.List;
 
 import static java.util.Collections.singletonList;
-import static java.util.Collections.unmodifiableList;
 import static java.util.stream.Collectors.joining;
 
-public class AlreadyExistsException extends RuntimeException implements ExceptionWithContext {
+public class AlreadyExistsException extends ExceptionWithContext {
 
   private static final String CODE = "FtR7UznKU1";
 
-  private final List<ContextEntry> context;
-
   public AlreadyExistsException(ModelObject object) {
     this(singletonList(new ContextEntry(object.getClass(), object.getId())));
   }
@@ -21,12 +18,7 @@ public class AlreadyExistsException extends RuntimeException implements Exceptio
   }
 
   private AlreadyExistsException(List<ContextEntry> context) {
-    super(createMessage(context));
-    this.context = context;
-  }
-
-  public List<ContextEntry> getContext() {
-    return unmodifiableList(context);
+    super(context, createMessage(context));
   }
 
   @Override
diff --git a/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java b/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
index 6fb8ac2b62..d566859b4c 100644
--- a/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
+++ b/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
@@ -3,15 +3,12 @@ package sonia.scm;
 import java.util.Collections;
 import java.util.List;
 
-import static java.util.Collections.unmodifiableList;
 import static java.util.stream.Collectors.joining;
 
-public class ConcurrentModificationException extends RuntimeException implements ExceptionWithContext {
+public class ConcurrentModificationException extends ExceptionWithContext {
 
   private static final String CODE = "2wR7UzpPG1";
 
-  private final List<ContextEntry> context;
-
   public ConcurrentModificationException(Class type, String id) {
     this(Collections.singletonList(new ContextEntry(type, id)));
   }
@@ -21,12 +18,7 @@ public class ConcurrentModificationException extends RuntimeException implements
   }
 
   private ConcurrentModificationException(List<ContextEntry> context) {
-    super(createMessage(context));
-    this.context = context;
-  }
-
-  public List<ContextEntry> getContext() {
-    return unmodifiableList(context);
+    super(context, createMessage(context));
   }
 
   @Override
diff --git a/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java b/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
index 93edc1f63b..255738455c 100644
--- a/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
+++ b/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
@@ -2,10 +2,20 @@ package sonia.scm;
 
 import java.util.List;
 
-public interface ExceptionWithContext {
-  List<ContextEntry> getContext();
+import static java.util.Collections.unmodifiableList;
 
-  String getMessage();
+public abstract class ExceptionWithContext extends RuntimeException {
 
-  String getCode();
+  private final List<ContextEntry> context;
+
+  public ExceptionWithContext(List<ContextEntry> context, String message) {
+    super(message);
+    this.context = context;
+  }
+
+  public List<ContextEntry> getContext() {
+    return unmodifiableList(context);
+  }
+
+  public abstract String getCode();
 }
diff --git a/scm-core/src/main/java/sonia/scm/NotFoundException.java b/scm-core/src/main/java/sonia/scm/NotFoundException.java
index 30696c73b6..69b9617e93 100644
--- a/scm-core/src/main/java/sonia/scm/NotFoundException.java
+++ b/scm-core/src/main/java/sonia/scm/NotFoundException.java
@@ -1,21 +1,14 @@
 package sonia.scm;
 
-import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.Repository;
-
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
-import static java.util.Collections.unmodifiableList;
 import static java.util.stream.Collectors.joining;
 
-public class NotFoundException extends RuntimeException implements ExceptionWithContext {
+public class NotFoundException extends ExceptionWithContext {
 
   private static final String CODE = "AGR7UzkhA1";
 
-  private final List<ContextEntry> context;
-
   public NotFoundException(Class type, String id) {
     this(Collections.singletonList(new ContextEntry(type, id)));
   }
@@ -29,12 +22,7 @@ public class NotFoundException extends RuntimeException implements ExceptionWith
   }
 
   private NotFoundException(List<ContextEntry> context) {
-    super(createMessage(context));
-    this.context = context;
-  }
-
-  public List<ContextEntry> getContext() {
-    return unmodifiableList(context);
+    super(context, createMessage(context));
   }
 
   @Override
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
index b25af05d50..43b8a38ccc 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
@@ -1,6 +1,5 @@
 package sonia.scm.api.rest;
 
-import com.google.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.ExceptionWithContext;
@@ -10,7 +9,7 @@ import sonia.scm.web.VndMediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 
-public class ContextualExceptionMapper<E extends Throwable & ExceptionWithContext> implements ExceptionMapper<E> {
+public class ContextualExceptionMapper<E extends ExceptionWithContext> implements ExceptionMapper<E> {
 
   private static final Logger logger = LoggerFactory.getLogger(ContextualExceptionMapper.class);
 

From a285ddb2530600463abe198dec3a342213c57103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 26 Oct 2018 15:24:25 +0200
Subject: [PATCH 037/188] Adapt InvalidPasswordException and mapper

---
 .../sonia/scm/user/InvalidPasswordException.java | 16 +++++++++++++---
 .../InvalidPasswordExceptionMapper.java          | 14 +++++++-------
 .../java/sonia/scm/user/DefaultUserManager.java  |  3 ++-
 .../scm/api/v2/resources/DispatcherMock.java     |  2 +-
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/user/InvalidPasswordException.java b/scm-core/src/main/java/sonia/scm/user/InvalidPasswordException.java
index 870430a1bb..11fb11bef5 100644
--- a/scm-core/src/main/java/sonia/scm/user/InvalidPasswordException.java
+++ b/scm-core/src/main/java/sonia/scm/user/InvalidPasswordException.java
@@ -1,8 +1,18 @@
 package sonia.scm.user;
 
-public class InvalidPasswordException extends RuntimeException {
+import sonia.scm.ContextEntry;
+import sonia.scm.ExceptionWithContext;
 
-  public InvalidPasswordException() {
-    super("The given Password does not match with the stored one.");
+public class InvalidPasswordException extends ExceptionWithContext {
+
+  private static final String CODE = "8YR7aawFW1";
+
+  public InvalidPasswordException(ContextEntry.ContextBuilder passwordChange) {
+    super(passwordChange.build(), "The given old password does not match with the stored one.");
+  }
+
+  @Override
+  public String getCode() {
+    return CODE;
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/InvalidPasswordExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/InvalidPasswordExceptionMapper.java
index 7c5364ba03..7a1d311a1c 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/InvalidPasswordExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/InvalidPasswordExceptionMapper.java
@@ -1,17 +1,17 @@
 package sonia.scm.api.v2.resources;
 
+import sonia.scm.api.rest.ContextualExceptionMapper;
 import sonia.scm.user.InvalidPasswordException;
 
+import javax.inject.Inject;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
 @Provider
-public class InvalidPasswordExceptionMapper implements ExceptionMapper<InvalidPasswordException> {
-  @Override
-  public Response toResponse(InvalidPasswordException exception) {
-    return Response.status(Response.Status.BAD_REQUEST)
-      .entity(exception.getMessage())
-      .build();
+public class InvalidPasswordExceptionMapper extends ContextualExceptionMapper<InvalidPasswordException> {
+
+  @Inject
+  public InvalidPasswordExceptionMapper(ExceptionWithContextToErrorDtoMapper mapper) {
+    super(InvalidPasswordException.class, Response.Status.BAD_REQUEST, mapper);
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
index 807024c36b..41d2ed467f 100644
--- a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
@@ -39,6 +39,7 @@ import com.google.inject.Singleton;
 import org.apache.shiro.SecurityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sonia.scm.ContextEntry;
 import sonia.scm.EagerSingleton;
 import sonia.scm.HandlerEventType;
 import sonia.scm.ManagerDaoAdapter;
@@ -402,7 +403,7 @@ public class DefaultUserManager extends AbstractUserManager
     User user = get((String) SecurityUtils.getSubject().getPrincipals().getPrimaryPrincipal());
 
     if (!user.getPassword().equals(oldPassword)) {
-      throw new InvalidPasswordException();
+      throw new InvalidPasswordException(ContextEntry.ContextBuilder.entity("passwordChange", "-").in(User.class, user.getName()));
     }
 
     user.setPassword(newPassword);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
index 9c34549d34..0d95d0a642 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
@@ -19,7 +19,7 @@ public class DispatcherMock {
     dispatcher.getProviderFactory().registerProvider(AuthorizationExceptionMapper.class);
     dispatcher.getProviderFactory().registerProvider(InternalRepositoryExceptionMapper.class);
     dispatcher.getProviderFactory().registerProvider(ChangePasswordNotAllowedExceptionMapper.class);
-    dispatcher.getProviderFactory().registerProvider(InvalidPasswordExceptionMapper.class);
+    dispatcher.getProviderFactory().register(new InvalidPasswordExceptionMapper(mapper));
     dispatcher.getProviderFactory().registerProvider(IllegalArgumentExceptionMapper.class);
     return dispatcher;
   }

From 03606940523f2b066baa56ea573fe3a296139396 Mon Sep 17 00:00:00 2001
From: Mohamed Karray <mohamed.karray.sr@gmail.com>
Date: Fri, 26 Oct 2018 16:26:55 +0200
Subject: [PATCH 038/188] fix show diff in git format for svn repo

---
 .../test/java/sonia/scm/it/DiffITCase.java    |  265 ++++
 .../sonia/scm/it/RepositoryAccessITCase.java  |   51 +-
 .../sonia/scm/it/utils/RepositoryUtil.java    |   19 +-
 .../java/sonia/scm/it/utils/ScmRequests.java  |    8 +-
 .../src/test/resources/diff/binaryfile/echo   |  Bin 0 -> 35000 bytes
 .../modified/v1/SvnDiffGenerator_forTest.java | 1230 ++++++++++++++++
 .../modified/v2/SvnDiffGenerator_forTest.java | 1234 ++++++++++++++++
 .../original/SvnDiffGenerator_forTest.java    | 1240 +++++++++++++++++
 .../repository/spi/SCMSvnDiffGenerator.java   |   57 +-
 .../scm/repository/spi/SvnDiffCommand.java    |   69 +-
 .../components/changesets/ChangesetDetails.js |   79 +-
 .../repos/components/changesets/changesets.js |   17 +-
 .../containers/{DiffView.js => ScmDiff.js}    |    4 +-
 .../api/v2/resources/DiffRootResource.java    |    8 +-
 .../api/v2/resources/DiffResourceTest.java    |   25 +-
 15 files changed, 4137 insertions(+), 169 deletions(-)
 create mode 100644 scm-it/src/test/java/sonia/scm/it/DiffITCase.java
 create mode 100755 scm-it/src/test/resources/diff/binaryfile/echo
 create mode 100644 scm-it/src/test/resources/diff/largefile/modified/v1/SvnDiffGenerator_forTest.java
 create mode 100644 scm-it/src/test/resources/diff/largefile/modified/v2/SvnDiffGenerator_forTest.java
 create mode 100644 scm-it/src/test/resources/diff/largefile/original/SvnDiffGenerator_forTest.java
 rename scm-ui/src/repos/containers/{DiffView.js => ScmDiff.js} (93%)

diff --git a/scm-it/src/test/java/sonia/scm/it/DiffITCase.java b/scm-it/src/test/java/sonia/scm/it/DiffITCase.java
new file mode 100644
index 0000000000..bf104ac852
--- /dev/null
+++ b/scm-it/src/test/java/sonia/scm/it/DiffITCase.java
@@ -0,0 +1,265 @@
+package sonia.scm.it;
+
+import org.apache.http.HttpStatus;
+import org.assertj.core.util.Lists;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import sonia.scm.it.utils.RepositoryUtil;
+import sonia.scm.it.utils.ScmRequests;
+import sonia.scm.it.utils.TestData;
+import sonia.scm.repository.Changeset;
+import sonia.scm.repository.client.api.RepositoryClient;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static sonia.scm.it.utils.RestUtil.ADMIN_PASSWORD;
+import static sonia.scm.it.utils.RestUtil.ADMIN_USERNAME;
+
+public class DiffITCase {
+
+  @Rule
+  public TemporaryFolder tempFolder = new TemporaryFolder();
+  private RepositoryClient svnRepositoryClient;
+  private RepositoryClient gitRepositoryClient;
+  private RepositoryClient hgRepositoryClient;
+  private ScmRequests.RepositoryResponse<ScmRequests.IndexResponse> svnRepositoryResponse;
+  private ScmRequests.RepositoryResponse<ScmRequests.IndexResponse> hgRepositoryResponse;
+  private ScmRequests.RepositoryResponse<ScmRequests.IndexResponse> gitRepositoryResponse;
+  private File svnFolder;
+  private File gitFolder;
+  private File hgFolder;
+
+  @Before
+  public void init() throws IOException {
+    TestData.createDefault();
+    String namespace = ADMIN_USERNAME;
+    String repo = TestData.getDefaultRepoName("svn");
+    svnRepositoryResponse =
+      ScmRequests.start()
+        .requestIndexResource(ADMIN_USERNAME, ADMIN_PASSWORD)
+        .requestRepository(namespace, repo)
+        .assertStatusCode(HttpStatus.SC_OK);
+    svnFolder = tempFolder.newFolder("svn");
+    svnRepositoryClient = RepositoryUtil.createRepositoryClient("svn", svnFolder);
+
+    repo = TestData.getDefaultRepoName("git");
+    gitRepositoryResponse =
+      ScmRequests.start()
+        .requestIndexResource(ADMIN_USERNAME, ADMIN_PASSWORD)
+        .requestRepository(namespace, repo)
+        .assertStatusCode(HttpStatus.SC_OK);
+    gitFolder = tempFolder.newFolder("git");
+    gitRepositoryClient = RepositoryUtil.createRepositoryClient("git", gitFolder);
+
+    repo = TestData.getDefaultRepoName("hg");
+    hgRepositoryResponse =
+      ScmRequests.start()
+        .requestIndexResource(ADMIN_USERNAME, ADMIN_PASSWORD)
+        .requestRepository(namespace, repo)
+        .assertStatusCode(HttpStatus.SC_OK);
+    hgFolder = tempFolder.newFolder("hg");
+    hgRepositoryClient = RepositoryUtil.createRepositoryClient("hg", hgFolder);
+  }
+
+  @Test
+  public void shouldFindDiffsInGitFormat() throws IOException {
+    String svnDiff = getDiff(RepositoryUtil.createAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, "a.txt", "content of a"), svnRepositoryResponse);
+    String gitDiff = getDiff(RepositoryUtil.createAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, "a.txt", "content of a"), gitRepositoryResponse);
+    String hgDiff = getDiff(RepositoryUtil.createAndCommitFile(hgRepositoryClient, ADMIN_USERNAME, "a.txt", "content of a"), hgRepositoryResponse);
+
+    assertThat(Lists.newArrayList(svnDiff, gitDiff, hgDiff))
+      .allSatisfy(diff -> assertThat(diff)
+        .contains("diff --git "));
+  }
+
+  @Test
+  public void svnAddFileDiffShouldBeConvertedToGitDiff() throws IOException {
+    String svnDiff = getDiff(RepositoryUtil.createAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, "a.txt", "content of a"), svnRepositoryResponse);
+    String gitDiff = getDiff(RepositoryUtil.createAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, "a.txt", "content of a"), gitRepositoryResponse);
+
+    String expected = getGitDiffWithoutIndexLine(gitDiff);
+    assertThat(svnDiff)
+      .isEqualTo(expected);
+  }
+
+  @Test
+  public void svnDeleteFileDiffShouldBeConvertedToGitDiff() throws IOException {
+    RepositoryUtil.createAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, "a.txt", "content of a");
+    RepositoryUtil.createAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, "a.txt", "content of a");
+
+    String svnDiff = getDiff(RepositoryUtil.removeAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, "a.txt"), svnRepositoryResponse);
+    String gitDiff = getDiff(RepositoryUtil.removeAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, "a.txt"), gitRepositoryResponse);
+
+    String expected = getGitDiffWithoutIndexLine(gitDiff);
+    assertThat(svnDiff)
+      .isEqualTo(expected);
+  }
+
+  @Test
+  public void svnUpdateFileDiffShouldBeConvertedToGitDiff() throws IOException {
+    RepositoryUtil.createAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, "a.txt", "content of a");
+    RepositoryUtil.createAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, "a.txt", "content of a");
+
+    String svnDiff = getDiff(RepositoryUtil.updateAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, "a.txt", "the updated content of a"), svnRepositoryResponse);
+    String gitDiff = getDiff(RepositoryUtil.updateAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, "a.txt", "the updated content of a"), gitRepositoryResponse);
+
+    String expected = getGitDiffWithoutIndexLine(gitDiff);
+    assertThat(svnDiff)
+      .isEqualTo(expected);
+  }
+
+  @Test
+  public void svnMultipleChangesDiffShouldBeConvertedToGitDiff() throws IOException {
+    String svnDiff = getDiff(applyMultipleChanges(svnRepositoryClient, "fileToBeDeleted.txt", "fileToBeUpdated.txt", "addedFile.txt"), svnRepositoryResponse);
+    String gitDiff = getDiff(applyMultipleChanges(gitRepositoryClient, "fileToBeDeleted.txt", "fileToBeUpdated.txt", "addedFile.txt"), gitRepositoryResponse);
+
+    String endOfDiffPart = "\\ No newline at end of file\n";
+    String[] gitDiffs = gitDiff.split(endOfDiffPart);
+    List<String> expected = Arrays.stream(gitDiffs)
+      .map(this::getGitDiffWithoutIndexLine)
+      .collect(Collectors.toList());
+    assertThat(svnDiff.split(endOfDiffPart))
+      .containsExactlyInAnyOrderElementsOf(expected);
+  }
+
+  @Test
+  public void svnMultipleSubFolderChangesDiffShouldBeConvertedToGitDiff() throws IOException {
+    String svnDiff = getDiff(applyMultipleChanges(svnRepositoryClient, "a/b/fileToBeDeleted.txt", "a/c/fileToBeUpdated.txt", "a/d/addedFile.txt"), svnRepositoryResponse);
+    String gitDiff = getDiff(applyMultipleChanges(gitRepositoryClient, "a/b/fileToBeDeleted.txt", "a/c/fileToBeUpdated.txt", "a/d/addedFile.txt"), gitRepositoryResponse);
+
+    String endOfDiffPart = "\\ No newline at end of file\n";
+    String[] gitDiffs = gitDiff.split(endOfDiffPart);
+    List<String> expected = Arrays.stream(gitDiffs)
+      .map(this::getGitDiffWithoutIndexLine)
+      .collect(Collectors.toList());
+    assertThat(svnDiff.split(endOfDiffPart))
+      .containsExactlyInAnyOrderElementsOf(expected);
+  }
+
+  @Test
+  public void svnLargeChangesDiffShouldBeConvertedToGitDiff() throws IOException, URISyntaxException {
+    String fileName = "SvnDiffGenerator_forTest.java";
+    RepositoryUtil.createAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, "");
+    RepositoryUtil.createAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, "");
+
+    String fileContent = getFileContent("/diff/largefile/original/SvnDiffGenerator_forTest.java");
+    String svnDiff = getDiff(RepositoryUtil.updateAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, fileContent), svnRepositoryResponse);
+    String gitDiff = getDiff(RepositoryUtil.updateAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, fileContent), gitRepositoryResponse);
+    assertThat(svnDiff)
+      .isEqualTo(getGitDiffWithoutIndexLine(gitDiff));
+
+    fileContent = getFileContent("/diff/largefile/modified/v1/SvnDiffGenerator_forTest.java");
+    svnDiff = getDiff(RepositoryUtil.updateAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, fileContent), svnRepositoryResponse);
+    gitDiff = getDiff(RepositoryUtil.updateAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, fileContent), gitRepositoryResponse);
+    assertThat(svnDiff)
+      .isEqualTo(getGitDiffWithoutIndexLine(gitDiff));
+
+    fileContent = getFileContent("/diff/largefile/modified/v2/SvnDiffGenerator_forTest.java");
+    svnDiff = getDiff(RepositoryUtil.updateAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, fileContent), svnRepositoryResponse);
+    gitDiff = getDiff(RepositoryUtil.updateAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, fileContent), gitRepositoryResponse);
+    assertThat(svnDiff)
+      .isEqualTo(getGitDiffWithoutIndexLine(gitDiff));
+
+  }
+
+  /**
+   * FIXME: the binary Git Diff output is not GIT conform
+   */
+  @Test
+  @Ignore
+  @SuppressWarnings("squid:S1607")
+  public void svnBinaryChangesDiffShouldBeConvertedToGitDiff() throws IOException, URISyntaxException {
+    String fileName = "binary";
+    File file = new File(svnRepositoryClient.getWorkingCopy(), fileName);
+    Files.copy(Paths.get(getClass().getResource("/diff/binaryfile/echo").toURI()), Paths.get(file.toURI()));
+    Changeset commit = RepositoryUtil.addFileAndCommit(svnRepositoryClient, fileName, ADMIN_USERNAME, "");
+
+    file = new File(gitRepositoryClient.getWorkingCopy(), fileName);
+    Files.copy(Paths.get(getClass().getResource("/diff/binaryfile/echo").toURI()), Paths.get(file.toURI()));
+
+    Changeset commit1 = RepositoryUtil.addFileAndCommit(gitRepositoryClient, fileName, ADMIN_USERNAME, "");
+    String svnDiff = getDiff(commit, svnRepositoryResponse);
+    String gitDiff = getDiff(commit1, gitRepositoryResponse);
+    assertThat(svnDiff)
+      .isEqualTo(getGitDiffWithoutIndexLine(gitDiff));
+
+  }
+
+  @Test
+  public void svnRenameChangesDiffShouldBeConvertedToGitDiff() throws IOException, URISyntaxException {
+    String fileName = "a.txt";
+    RepositoryUtil.createAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, "content of a");
+    RepositoryUtil.createAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, "content of a");
+
+    String newFileName = "renamed_a.txt";
+    File file = new File(svnRepositoryClient.getWorkingCopy(), fileName);
+    file.renameTo(new File(svnRepositoryClient.getWorkingCopy(), newFileName));
+
+    String svnDiff = getDiff(RepositoryUtil.addFileAndCommit(svnRepositoryClient, newFileName, ADMIN_USERNAME, "renamed file"), svnRepositoryResponse);
+
+    file = new File(gitRepositoryClient.getWorkingCopy(), fileName);
+    file.renameTo(new File(gitRepositoryClient.getWorkingCopy(), newFileName));
+    String gitDiff = getDiff(RepositoryUtil.addFileAndCommit(gitRepositoryClient, newFileName, ADMIN_USERNAME, "renamed file"), gitRepositoryResponse);
+
+    String expected = getGitDiffWithoutIndexLine(gitDiff);
+    assertThat(svnDiff)
+      .isEqualTo(expected);
+  }
+
+  public String getFileContent(String name) throws URISyntaxException, IOException {
+    Path path;
+    path = Paths.get(getClass().getResource(name).toURI());
+    Stream<String> lines = Files.lines(path);
+    String data = lines.collect(Collectors.joining("\n"));
+    lines.close();
+    return data;
+  }
+
+  /**
+   * The index line is not provided from the svn git formatter and it is not needed in the ui diff view
+   * for more details about the git diff format: https://git-scm.com/docs/git-diff
+   *
+   * @param gitDiff
+   * @return diff without the index line
+   */
+  private String getGitDiffWithoutIndexLine(String gitDiff) {
+    return gitDiff.replaceAll(".*(index.*\n)", "");
+  }
+
+  private String getDiff(Changeset svnChangeset, ScmRequests.RepositoryResponse<ScmRequests.IndexResponse> svnRepositoryResponse) {
+    return svnRepositoryResponse.requestChangesets()
+      .requestDiffInGitFormat(svnChangeset.getId())
+      .getResponse()
+      .body()
+      .asString();
+  }
+
+  private Changeset applyMultipleChanges(RepositoryClient repositoryClient, String fileToBeDeleted, final String fileToBeUpdated, final String addedFile) throws IOException {
+    RepositoryUtil.createAndCommitFile(repositoryClient, ADMIN_USERNAME, fileToBeDeleted, "file to be deleted");
+    RepositoryUtil.createAndCommitFile(repositoryClient, ADMIN_USERNAME, fileToBeUpdated, "file to be updated");
+    Map<String, String> addedFiles = new HashMap<String, String>() {{
+      put(addedFile, "content");
+    }};
+    Map<String, String> modifiedFiles = new HashMap<String, String>() {{
+      put(fileToBeUpdated, "the updated content");
+    }};
+    ArrayList<String> removedFiles = Lists.newArrayList(fileToBeDeleted);
+    return RepositoryUtil.commitMultipleFileModifications(repositoryClient, ADMIN_USERNAME, addedFiles, modifiedFiles, removedFiles);
+  }
+}
diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java
index 334274b7b0..48585dacd3 100644
--- a/scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java
@@ -1,5 +1,6 @@
 package sonia.scm.it;
 
+import groovy.util.logging.Slf4j;
 import io.restassured.response.ExtractableResponse;
 import io.restassured.response.Response;
 import org.apache.http.HttpStatus;
@@ -37,6 +38,7 @@ import static sonia.scm.it.utils.RestUtil.given;
 import static sonia.scm.it.utils.ScmTypes.availableScmTypes;
 
 @RunWith(Parameterized.class)
+@Slf4j
 public class RepositoryAccessITCase {
 
   @Rule
@@ -63,9 +65,9 @@ public class RepositoryAccessITCase {
     String repo = TestData.getDefaultRepoName(repositoryType);
     repositoryResponse =
       ScmRequests.start()
-      .requestIndexResource(ADMIN_USERNAME, ADMIN_PASSWORD)
-      .requestRepository(namespace, repo)
-      .assertStatusCode(HttpStatus.SC_OK);
+        .requestIndexResource(ADMIN_USERNAME, ADMIN_PASSWORD)
+        .requestRepository(namespace, repo)
+        .assertStatusCode(HttpStatus.SC_OK);
   }
 
   @Test
@@ -175,6 +177,7 @@ public class RepositoryAccessITCase {
   }
 
   @Test
+  @SuppressWarnings("squid:S2925")
   public void shouldReadContent() throws IOException, InterruptedException {
     RepositoryClient repositoryClient = RepositoryUtil.createRepositoryClient(repositoryType, folder);
     RepositoryUtil.createAndCommitFile(repositoryClient, "scmadmin", "a.txt", "a");
@@ -262,40 +265,6 @@ public class RepositoryAccessITCase {
     assertThat(changesets).size().isBetween(2, 3); // svn has an implicit root revision '0' that is extra to the two commits
   }
 
-  @Test
-  public void shouldFindDiffs() throws IOException {
-    RepositoryClient repositoryClient = RepositoryUtil.createRepositoryClient(repositoryType, folder);
-
-    RepositoryUtil.createAndCommitFile(repositoryClient, "scmadmin", "a.txt", "a");
-    RepositoryUtil.createAndCommitFile(repositoryClient, "scmadmin", "b.txt", "b");
-
-    String changesetsUrl = given()
-      .when()
-      .get(TestData.getDefaultRepositoryUrl(repositoryType))
-      .then()
-      .statusCode(HttpStatus.SC_OK)
-      .extract()
-      .path("_links.changesets.href");
-
-    String diffUrl = given()
-      .when()
-      .get(changesetsUrl)
-      .then()
-      .statusCode(HttpStatus.SC_OK)
-      .extract()
-      .path("_embedded.changesets[0]._links.diff.href");
-
-    given()
-      .when()
-      .get(diffUrl)
-      .then()
-      .statusCode(HttpStatus.SC_OK)
-      .extract()
-      .body()
-      .asString()
-      .contains("diff");
-
-  }
 
   @Test
   @SuppressWarnings("unchecked")
@@ -393,12 +362,10 @@ public class RepositoryAccessITCase {
     RepositoryUtil.createAndCommitFile(repositoryClient, ADMIN_USERNAME, "b.txt", "b");
     RepositoryUtil.createAndCommitFile(repositoryClient, ADMIN_USERNAME, "c.txt", "c");
     RepositoryUtil.createAndCommitFile(repositoryClient, ADMIN_USERNAME, "d.txt", "d");
-    Map<String, String> addedFiles = new HashMap<String, String>()
-    {{
+    Map<String, String> addedFiles = new HashMap<String, String>() {{
       put("a.txt", "bla bla");
     }};
-    Map<String, String> modifiedFiles = new HashMap<String, String>()
-    {{
+    Map<String, String> modifiedFiles = new HashMap<String, String>() {{
       put("b.txt", "new content");
     }};
     ArrayList<String> removedFiles = Lists.newArrayList("c.txt", "d.txt");
@@ -414,7 +381,7 @@ public class RepositoryAccessITCase {
       .assertAdded(a -> assertThat(a)
         .hasSize(1)
         .containsExactly("a.txt"))
-      .assertModified(m-> assertThat(m)
+      .assertModified(m -> assertThat(m)
         .hasSize(1)
         .containsExactly("b.txt"))
       .assertRemoved(r -> assertThat(r)
diff --git a/scm-it/src/test/java/sonia/scm/it/utils/RepositoryUtil.java b/scm-it/src/test/java/sonia/scm/it/utils/RepositoryUtil.java
index 11db0200f1..427d98f245 100644
--- a/scm-it/src/test/java/sonia/scm/it/utils/RepositoryUtil.java
+++ b/scm-it/src/test/java/sonia/scm/it/utils/RepositoryUtil.java
@@ -80,6 +80,11 @@ public class RepositoryUtil {
     return file;
   }
 
+  public static Changeset updateAndCommitFile(RepositoryClient repositoryClient, String username, String fileName, String content) throws IOException {
+     writeAndAddFile(repositoryClient, fileName, content);
+    return commit(repositoryClient, username, "updated " + fileName);
+  }
+
   public static Changeset removeAndCommitFile(RepositoryClient repositoryClient, String username, String fileName) throws IOException {
     deleteFileAndApplyRemoveCommand(repositoryClient, fileName);
     return commit(repositoryClient, username, "removed " + fileName);
@@ -102,11 +107,21 @@ public class RepositoryUtil {
     } else {
       path = thisName;
     }
-    repositoryClient.getAddCommand().add(path);
+    addFile(repositoryClient, path);
     return path;
   }
 
-  static Changeset commit(RepositoryClient repositoryClient, String username, String message) throws IOException {
+  public static Changeset addFileAndCommit(RepositoryClient repositoryClient, String path, String username, String message) throws IOException {
+    repositoryClient.getAddCommand().add(path);
+    return commit(repositoryClient, username, message);
+  }
+
+
+  public static void addFile(RepositoryClient repositoryClient, String path) throws IOException {
+    repositoryClient.getAddCommand().add(path);
+  }
+
+  public static Changeset commit(RepositoryClient repositoryClient, String username, String message) throws IOException {
     LOG.info("user: {} try to commit with message:  {}", username, message);
     Changeset changeset = repositoryClient.getCommitCommand().commit(new Person(username, username + "@scm-manager.org"), message);
     if (repositoryClient.isCommandSupported(ClientCommand.PUSH)) {
diff --git a/scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java b/scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java
index 69c79c37bf..da78a0cb02 100644
--- a/scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java
+++ b/scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java
@@ -220,8 +220,8 @@ public class ScmRequests {
       return this;
     }
 
-    public DiffResponse<ChangesetsResponse> requestDiff(String revision) {
-      return new DiffResponse<>(applyGETRequestFromLink(response, "_embedded.changesets.find{it.id=='" + revision + "'}._links.diff.href"), this);
+    public DiffResponse<ChangesetsResponse> requestDiffInGitFormat(String revision) {
+      return new DiffResponse<>(applyGETRequestFromLinkWithParams(response, "_embedded.changesets.find{it.id=='" + revision + "'}._links.diff.href", "?format=GIT"), this);
     }
 
     public ModificationsResponse<ChangesetsResponse> requestModifications(String revision) {
@@ -348,6 +348,10 @@ public class ScmRequests {
       this.previousResponse = previousResponse;
     }
 
+    public Response getResponse(){
+      return response;
+    }
+
     public PREV returnToPrevious() {
       return previousResponse;
     }
diff --git a/scm-it/src/test/resources/diff/binaryfile/echo b/scm-it/src/test/resources/diff/binaryfile/echo
new file mode 100755
index 0000000000000000000000000000000000000000..11bc2152e406ff3fd32b3430ef1cdfb55b31515b
GIT binary patch
literal 35000
zcmeHweS8$v_4n*1ff!&XDri(Fqb?E@Lc*H~f@H~t%)){Z0%8fx%Vt9&AxX2dBvI7W
zO)%4C`%9Ht+mBCw^yO!5wZB@QHl;vq0tncu4KG?itMPrtpdu<DDEoZRojbdeNLu^z
z`8=QJ4+nP7oO91T_uO;OJ@;j9X74WaF0k8df_WtgHwuImk2NUyJYnlS{01Oj$Q3TY
z_gLWyVHoffMl;g$4S-bRI?Y9!FqPAj0F&{_wHt)NkQa|KjLX!JAeA@Nb$FeTVnRWX
z7=iMUuE+0SD4@h{OxQ`v;L0W@c1i4;)FaZ$4Gaa8*o_H~bHz+(){n%|r-avUFmy91
zf?z`8rK|WYrHbx<UQXB-p_|Jyp_%Vy<cq6rWc{b#={$8QFK;Njr1Jty$g3+%t*fn^
zHDhXB)s(v0`e4hHmfTrWX3fY7G-OR<^(OhmTeM_3D~Z~htIpC#11B1#rvw5Y&aB(`
z4ad{JpWGDkZrsy0`2|Xw$@2^cyvTOIdC??cMY&6GNIWeMFdv`f$TdID9Jgs~`gayz
z{mkO|SMMlZ|KrCOz0v*P7WD@Uro8#e^OJo|Z&tcK$vY7ld+njE2gknWyLMjkqK(Kp
z<aIfezvw)vbB3Uw7=j*vjPuF)%MkROA?Qb7JPB!ouT~JwC;zq~^!fD=^yDGvzZ`<@
z8lv1E3_<_>5cHdepidftes~Cd$QRCMhf_n)cMU;bK7{;~A?SY|g8tGF^4}PO|G$Ue
z-#P^UCqwwd=R?RT9YW5Cq3A=%xoQah9YgRJ48gy42>u6#;2%E(KehS!+I`Uw^zRQL
zfBz8li(u#T$-jLF`Mx3KygmefG6J21w87U!L&&KF<N5UY5%{kfEChJg5OT(&UKa`(
zf)tWiu3Vn?IN*iCWkLt1o8y_6@uv&jr3Par=PzUQF@j)@i=2K6<&vDxAUSinocv;g
z(Hy_-26`p<I|uPMaXm9Q-Q>43`WN|wD3|06E_Vs&q|cT?@@I1S>4WHZbNSta=$jZl
zU69HR{ihm05HKG4X!x5YR9Dvp12sZfSz}Xey;5D~t63`q{7PMeucFQ`tgCEN8k&7V
zKxwM?t!pIM<f~~Cs(fqwisElk1b<UgLld$GlnUQk%3W4nQCla}2AY{bp~+uS2Vp`*
zWkZu9l=)j~6``@IVNFxTy0Y5(^(aQEZKyA+uUO}Y6ra-C=r4opvUQbZzF<??x{4M7
znvevPUFWYCg7rxD3G4jppeC|Ff%=9r(w77gofIuAtF~51scHx+LS4Y`U&}ZeTZL+0
zT|)phG=#6K4Aj;`wX(8cbzMWVP+wP8S5d#Fw!XR{u2v<LBA|4C{dy_@RjaD4UjxOe
zpoCBz@Kw}T3)QvIvO%bBZmLzNO4W`2dd7C1S_f)i6r=9dRSjUIvRW$2s%z^j>S}NI
z3zfC?Rb=L>hIJLS^<)C0a@2lga^z+S)l@Umv|+u!iB+JwF{lK}g7r{&t-nfuvZM^@
zz)fx5mQ@Gq>Ug;oC<{jTcCbP5m(e$>SJu!-h7AZS{7nI}aGB>O6pbpC1p|<5vIUgZ
zI)B;vin_ocQbp66fIxDYX9S!4@%Cq$Kw%PFhDI&(H8i$1)vl>ggd(qJenHu^tm%on
ztQqn9oWyP7Zd%q%=vK1046Wf`QyWnHO(ly9>Kf|(B^8zM<+8Fh>rjqiwK9YCyo@yW
zOZ*#%5k1M0n&6{5nne$!5SB84M(Y8CXBg(3c6^L)x-;lRK>)yILteTw=f4-%){deX
z{!dX9(Ui+-FQ661;~d}oy$3O^P8POud^F=v5_WMscscRgh3A0NWv(a8xLG{Tpr7XJ
z4U?YE>1NzC=~u2a_)~d2HR+Q$J$(>;DyL@*qR-)UX%OAR>6wG*t2sS;5WS4ka|hAq
zb9(+D`eREC{pCUQHJm?nP&_s9!SVO8TMRkngZLXc-ZF^Z$MM5=ODrR;g=pPiUVRpN
zhDij}Ec9^}`f&?A+d@BWp-;EaL%e+QMVgD6mpP6SeU?cCG{-rj&$ZCESmeyJ(97?V
z7)EunS?DzuI(I>q+GwHETFSgyEOc`$rL>TRPCA)ahlOrkUv^sPrjJsdhb(k-jQF+1
zLQjiR1>sQ(eT0SngoQrRLf>kkqvOV}ZVTNJrwYP83thC(do6S`7EtnG3;jY1f1ibJ
zoquT-`o$Lh;}$xtb<OLvg^pQM;^KZq?R!arDx_NIms;rQ7W!otdWMC5xrHuS=vP?i
znHIXa*FwqJ7Wy|V{J9qTcndw>LYFLb*+Re4LNB(^ud>irTIg3>=;ao=(?YMY&?i{v
zjTZVf7J7??KG8xCS?HM-dWVHhYf|&-w9v0LiGUAT=+{~3TP*a+7W$(W`V<TO2@5^T
zLf>kk$LF3%@3zos55c_lS?JSDB4DqDKEpzn!^cwPNXm0-B|&cQR_w7}IlMb{SDYg@
z^YYsyAvR$wzQytRxFfuV()GR=t_c?rP9aL~Wq2Cl6q@vIhT93JkfcAs@H4f*DHQ2j
z7=D6q3PE}&!`~&GLXRF|`0IpIH_;mzew6T3!pj+cfN%;udNITQLO6vSJ)hw_2_Hdt
zHp90OP9a8@82%*T6k7CjhX0Ci3Msn4@ShS+p+rA^4ulCmBAh~q-pBC!38&DZ_cHuD
zgj2}SyBU5j;S?(LCm4P^;S?hDEevlWoI-=%$?)3<r;wnB7+y&@g#x{i;ol^jhBUpL
z;Y$gpkf0Ycd?Dc!3iN!2&nKKhfS%3p*@RQq*CmEeBb<gpJ)Pm#68;Us1%_WmICXvf
z_~%sr%L$hV?_>Bygi}}7dl{ZaICXKoo8flCscY*`F#HTM*HD+%w=nz!;nbD&PKLir
zICWt?#PHV%r>?6vGW;mvnS_@!`~cyT2rp*%UkIlzs^>F&C*ju-p3U%Wgj1K)C5Asq
zICVumo#DSCoVuVc#Pe5o0%w=&7S{@oddjujRkD1U`nepPd;JZ9fL@fLefU`{hCU>=
z(cVb-bK6}Rp2*#)a&+bdaA?b5OiKJuBzhwA!tdEU;k~KaWOyc69w`)rKa<mIe+3^1
zAI~QG+-Cu_Oz468Zo2=B3W?4wgoA5Rt{}9(x5w>t*zUeaSJ20*JLPDxO;&Ho+#^UR
zMUKpT0M%h7Jqal&RcxcBu^gFuI}+qbQKo!DQFhb5rz9%;8{p~Ri;UW46aY0GalNJ+
zdX*Y_%^+Pm4P7$nzRI}&^#!=^xSr~74^Hz$%BcRcDUbT9M(sl;=z^voU(3mPocun5
z1~*G#&H+{}7j1_LGHtpEHY6A3ywv`l_}xuFJ(24}H%<}TAI81dwZi6&F0r*85Zfp%
zx^R2w(@EleA>4b_ZuwxJ+<saK=5+U89M%hw)LiRTcgY9eklW8H-;%@KHnGb)%+~fy
zu&@8BYH_?9^P@BMV%q`~89Gx~D7p{2#I6fTJnd(A!acUo8GrC4*EUkD|BcWFr$Z3i
zX-^o@Gb5*a)oNF%YqjfJuCiT)l<V6to;NyS6$~SeC#|6V`2I|BJXAl5ws^l<inoOr
zrf4chWwhf>nH}j~wO{PI*c)BTsz>{Jp);kyy>789U@L4psZ4N17xW_8?p8mXBa8QK
zhIFy3+v7`a^V<4ieMWt@mxA2Cc{>HtZS>XOA$Aqm!&-Lq=H5BOn}<h7_j<xl+fdI!
zAu9KVJ{>OJSBCyh#Ar!xuf7zB*tN(Wb%9^pNE=W&FXbH2=Q8>o_WX_wPEp%Ieh^6&
zyWCFkq}ydnm({&u`%P4%$lT$mCJK0kxm{jSwz%;-tg5EVmb%pw`g^d|c8b^ASkQij
zP<WNFjlT515lYc|8w=Upgi^5IMqm1G38mP+jlT4s5_$!p^rb&QXey!frMCg?RA131
zor%Tt2Z7M|MqP#Vl1vbwa*5yCGEX9(rHARW45q0AnDz}|O4D`tH+i$5{{eU0!}S@s
zHwNEPEmc&;Tpi#xh#zwh3kPp>)M$8%H=2?GfZkF7qV@{n-pX(4KR{mXewa?|x+6*5
zdD7i#OAltk2a?3D!}{Y$HSP<N^edpD(YNP+ifXnSY02uYe6cIm^G33^2x6k6lk@;m
zo+2mFE(0SqL={oUtlDtOdKJ)|nD!X>tFy%MZAiefCg(kmy8m0U`nnu`^LTLy^t~O+
zBsn@NiGjJ#!nm<9)jmo1nDr~fu1|q1m!l~k0?K)(W%VuPGE6~c6N)LwsMYY<cmb<-
zQL7|y<o_cvMrS_B#7sJe{BqB^Bw0N!_h|EE+a7uUIVA%EZCv0;5@;$sSYBxE_rN9u
zr^?~Ef3L*da?)ocn&T)i?Q_&zlTn2|DYf9UQT7n(Eqt`g=vTzPTCWC&fk%t}JZD04
zD_ZeIOux_%Wnc2WvaQ$bhg->@yAt);N=|OY$#JbXxw#dmnTZvrnTZ9bW{np0LQSKA
zFidSr0Sk>);oTuQGHx5{RV7D~C%~5wmfg;lobL9Rk_D6g0W(81@xGJH^}h{9S=}kC
zN1j5P3pw4|Z%)Tz>IYf}0Jwi^aQ}$7)g!WcR95$}NDa<0#1a{I35kf#+zU>o1%$6<
z?5`j!XwoUh^kD^Kvd>H~El4n(Wy*|u)?o5mn66APy=XA~!eDB&Fn#t3X~&BDt-*A!
z!4$SI{XN07$zWP-F#XuV^kjl*jlq;_Fjb&unzf6@ndIoWK6rq31Mx;@K5k*EA*Se<
zZzI`avey}7N;y%ZqkhB^OP%?UBh&p}x3gTpMK?9<Moo627foY~US~EkwX%D+6N7Hb
z{hVG*O`HzGWjrwh_gC|K3HMj>`%GfYr7xMjR?2E0#wQGp>2f4jhKG#&BRLX``Ozam
z%^N9C&55yUqjqVKvAF$Bv8@LjTF1v!zfrBIGOC%v<i|bZEGnOK^3NnndzB1<E<Y9`
zj$swEEr}JdS9|*-HdAOH4#z{<e?k&3OuNnyJ_GC!K8DIjxZRH-(3AHv3ZKc+$1RzI
zbkThTLT<MRA^FT__juLUO`okmW_=u@oVJ&eqocN>^-+eKL?z0YZK=RFcm-h7nb%n>
zFo9JdSOEI#2_M1~U;{Rn(4-FnXyryRwTv`oA(fUW<{;{+7b318QxW5sSqu)-3{IAJ
z%oIvVWco2>q8Vg7-pT6Ro^MG)JRanC%>AVmU%t#3gyyaVRXc}yH`?P8ZTX2<EHw8n
z&>()7GB%tm1usQVTuoeu8CP%ttrS<S-i11@uxR!jWCiCUaLVe_<T#ny3XH#z>9A!U
zt7MNy)pBA86X#Hi$lTCs2u(sZ#&WsA!qQ(sdjBhlXo>l4du*BV?WbrdEURa=JE<^e
ze3LOM@0TYXk;9)3yK9~tZ9IdqVibh^k)}KF+3SF(5N>$ci?Vv~qet?^AM6qD@5#@7
zJ~%>-u1uEIakoMpfcp)w3SiYPIWnq}@aWty#WD=Z0t<@TCTOT#`XNmoLLdsTr~0}2
z5gAqMgq_5$^ziGihR!Tkf}t}-ii8fg84_TM{{RS|y+9TVcXC70NGEm`+gOJA!9$@I
zdrt8AP)ky7a9^k;IXk#B)RHnixFgguEIZg0Y8fsBp9tM4ltX5oA#)Z1tH6Z3l3*KT
z+nMYIV!Hy*f@DmfZ)11Kxneu5r%?iCvMcD$ko<Qxj*mG+AR#&KU$h=7RQJ+)$fKTH
zzRa!u)uVnQtIvhsu*>%x+X|D&kv8XXf@+B~-Hp(a>Q=qZ778*FrJZJJh-!q;W+$bT
zTZX7M=c8bOyUaTti@CzFG!~!4`+jpFc%!3!3Dw-{84R@FlWqHAeQf1`uMJo(yh-7*
z7`X)yL>s<FAxp}|R2!sZpfqsBaGPq!EeV#f$dFa7Q0?=o|L~}MocHAQyTtGB_Jq&I
zf}`XJLTYGECML7r-(A>-xVIc@x9|oCks}+N>E7tbsp9v$uR>`qb*I?&3lfby8Eknt
zDVdfKXAxmaQ-ola96oJZpXu&E@O5{TIJ3PlPNr7%0VZKIi_XP2s8GZkL4r5$CF05y
z?|Tv<RF0HDXhd<!UiEKY6~hISLn5-Z-$F!tH|5GUBzYrX5Zhak5i1r^V3IS%_B%0$
zh|d?quFFDa?-K930=)#rZ9()FyAH;Ui<KF4x1n~-6qqQHDOzj-D9ixj=ACU=<I(eD
zm_MhR_X`v_$|kmpFgO-OMqr2DlH7h$8Lb}eem6zzIuIHCp!l<+;=K#OMeC+^7jDAG
zZ8Fv%?kl_7x)o`0-skI63ic%5IMEX=vU&2JUO%j0kNZa3L`>Z6g*n}e^F9b97j%rh
zQS8E^3`85bAf&x1x=+&*#i8d|<0I;W8l;9#+r_r6FiiM#irCh`ZtUCVAt&m?>Y>j@
zpQ!ExzfsLLJDA)ZRn84L2XeZ%PXw!eDOh-Y*=l9G0xGu(d4njnQ`N{8LeQ@sWP({!
zi0$t~D}6YX!RE<qiL$*C`TKh*F7QI1L#wdtVjG=QF!Hty$E^&G40K&uT(iZVAqPcp
z1$HuKwO4E}PNfdh4Z}*k%2caGZ-GT$;1+dyqPN)NsGSU)<WgZ^-T<X!TxuD;1FD<;
zV<^|Y57o>$a1xVCY&cwuS~12yU~$OpV=9%?t-ppLHy%&e+H`vbS@Q*m?KJshtoz#^
z11DQqO1)y+uYjP3nq5~vi!N9l=SRK!4`Keo@^6<Q4-MJBvy&|ww>Ob|AIWD6#qHIE
z`x#F2@$KsgU(RrvuWzp>oOVE{{f%`D1h0fc{~YF~j)%VMMn9vjscn6aMnJ5A4;np;
z^}cNCeYtF|A^sux=IRMTK1C04GYb>wGVS+cfooP*f0mglpO(wiADiz(U(_(zTl*sU
z1@z%2KTc-s+*V5Z(wF{y5RCeP$*AJJ#AEmu)r;t?YAfS(!}NRNI9N=b3}<WK3=6?~
zyy~Zh15Js01iIu+aG>WB4s;V7=sEE|I%J77avw@gaqUTVlrpj2Xe%6qPF%{-LYp`5
zZ~#j|L=?1grVSR&#0JHj3&f3C%w_ww!vYjm^k1JPPjYjE6{?3=H$_L(A7CkQLqdPH
z4{7?RSsBnt&VQq#1LT;lLixUjMCLC*44279s~Gk(T;#`bob`9&qb{$f#_6mJ>+9n<
z$$bcGVpAV(R6p9DMLD$_Y8mY}3N_*W+*Rrn3)S6lchploytq9kZtl6VSK24GSD+!)
z!_*WQXl{cTNZcTZZL5u2+L!tSw~Nt#Hg{8yC`PE>NgZe$a(W|m&SK0*?UMz;wP)Bw
zvp2bzqsE6w8ay#LmO5p$$p-x>R(FZGE~1G4Li<n=ZJ(h(<Q(ATw7<`K2a2HJk<-n>
zC4#g^eSrr|Si-O;g^Fb5N;$gN?#(+Az@SFs%7#qaJhAONn82C#V$FtlOQBi+1y<(+
z^%w^|U_g`M4`49l%h5LH7UW?A?_T2`C>!xJgHzbBO<foRXo)k|7(n~p;bU+<>&Ll#
z48}^U&G|6$<~-9;>b#3`-6^Yo^{Shk9b6(C$?x{6JDed<ysF~N_o{WyMv4^KtZLq<
zGL8-3KryUS`MFD?le4{(PI%S#wYM&ZYV9!8US$a;2r;oOgZfDL^f|HZM>IOoT*HVR
z7*u|MXdBtVbkeTVDfnz~X0~^;k<Tr<`@FWZS`z4(DBtVGR*m{93rTl|PuN7b)?KW6
zcVAWF9OZ==rZUFnd~%LP3R~H7IA#+!o<+g3`f1Kd@Oz!2Y}1+9^e)uVY#&px!nS9`
z_TONp<5u^CPulXO;{!*UW(0~)5`m%_fr6vw8)^7ZKT18^tqluzXBTu}$j1Z#xt?C1
zPSm7u-*BE_55F;-`V#qEcvrTJ2o!z`TMg=q6sh>+VC+;HzG#lI5TlcN932QV3`{x{
zM?9XzM>r<pE{LF+&1v{_oaOwp5QLWQ{`*;6@sQ=($}n^=TP=)^oVPGqa=mRyG&!eV
z#Cj&Y6P7@4oC6lID=n<A3VnKIv&L2z^1-)d^+Wlo>tJ9E@$iTbmFK<jrjgM;*=CPr
zqkxj$*1Z)*7eqHEHJHq%velic!>3}3vj(3QuX^e>!5!J;d<cAQbTc>~CYY}9YoBXb
zw73rMmf&}C<Y6}Lu9ByZWm`pF^|aW|BK1AH$+Ikb+!$vOn)Fs!awyA`^41bJ9)lNo
z)pu#uW}nF7kA4J^&aEb*yMV0_BVB(QJ-GcPv3(*mquINSqD*@yd15rhi&>X-g72US
zKAZL%0SmTaGki9!H$s|eF8vY+gx)0k6KYWkUK3zsM8T_&+hIc(VbbCSpui*77z+tn
zO^mX|!y}KDw0O{;!h#T-zcDxy8pXwsYHT5r$d45WQ<0QI%>=y_LYNXv186cJHzJ&2
z3#I`0nGs~V(dQv2^}#e{1=i(LpoO_(aN>0+ruI-lHBj&(B*}R_V%tNgJy-<`>)r%w
zIauGCz*)m!McJ@fTMt4``%5x{L%H~U)QEJ%Bc5NgoERsln2baftoo0#=|9A>J&`z6
z{fs5r!1|T_)0~D~^~=E&cSMA17mE|aTzlLOdo~;mvyLPb%4QRKB`lWMVW4;@!kH1-
zN9m7Z*rwIjC@|}GI4O<Ze*m;rC*djjQA`+Ey!5Iky{ay&hvT7^#aS<U9SsrQyjP5n
z`^9h@xF(b*1k?M+^Ks1;nqw0b2R);bqa`VVC+}c$KRr`1)vCY{I<S<1qM>>sVld@c
zR-K-DP{*$kyX+L!rc(SF&mtQ_Wb%y^9_Nc)$+O$KgYW7WB313xmt((6>>8UII(wsd
z-?wRxmyI#^{!D0;#h)D(!>d8#Q<^v7A@N3-hwhI!XRg++GGjMeyx9p&il-*cL)poE
zpvO*v-i_@Q^0^L3ggdUdnsvf|*0lyK?pfE;ufg7d5vSM+LZ=545H|c@3;SX})sJ9l
zt@e`l%X0fm%4DoeGsUhEXz;dYly7*|Gu}z3Y3Y>g>KJ(mg?O=RWI7%%_IuR7!zSX!
zAER_y#R~dn+!=!=_dJa1%=xZE0z!SNto}`VgjN*ParLEeNt4>ispa|_=BS3}s=X}x
zF$7Ku{w`Y8BH$je#DCo8nj-)U{<MYAsAa!TSy=Sf>A?pXYJ+|WqIx`PJ_xdQ_!T1-
z3wi@|q{vTX)}M1|`Wo*Y`cL66i1kL4{|Jb7>>ucDor(TN`$t}1%-BDAk#^6XgVxxK
zM$NUqf!U)z9T5uK;j81ecqD<sirBFRp5V@#dmjjQSGw+r!8`93?^^+CVRQ{TN=iFY
zJid?Rp0|_byj^137;+uNr`6c%z=o!*rYr-8?3?Qbz?3NG<fJol&pXMo?|^K3RqlB`
zS(}eqy449+gCSCw?4d-M6H_T~^v+awq!4rGE4&e3s#pCmyw3)`oUvfGOYMmTGhMfM
z@yG$4E7PmK!{&V2p<{+^sRyQe@^&?^!44&9x`;H*+byfpm5abl6;Ic?UIsVX1W!*-
z85B33`xs++0V^D3p&*p)y2XtN<Q#+qRv_iVX3=iV#|y*&pW#vqk$E@R`v#2KSU=&3
zj0d8t#fFrdWmtsS=6c+T7Yh2zu&Xv3x@cq4X^IDaI`%*tuQNb(M<m+ejiyjLpdUPy
z3s1vtJ4HS10a)6t`q?zW@_Y*1w=(V+7*9urV`Cap6aIkoyhOTs{dv+aGtx0Jf&|Rm
zUK`)7VfUz8j&8UwHFCXr{GgVzGu(%5RNKMVb55w2?y~qB<R77W!l9`AqGYu>c~JTv
z6Y1EU+B=+9%80=22b2qBwHdB?OZF~m3Qc+m+mY~J$ZSU*!-qd#z6@szJnBhwb#P@Y
zZtpfs;)O$>JDRXs0h^n-Ba4z_foyjqDHcHcoGE6@0XBYop#A5&<br-`yIf1d4emcE
zKP6uNA!;A&!Jfk@6_k%BH_uS{Iqzxrpm02-VI3-8-2C*2waMP-GOk4u*7NY;(a^=K
zo`5c{r8y^Es-A=XTjI>uMne_mv0#!ZNN~^0(0+ye0E$iNWD{hkdcgH_kr}muSjdBS
zx|Wh_=4yY%Is`sBnPfm4a!us|>J^!b)v->tHX2l2L~V<IsQWPn4?|2c)^(ATdkbOu
z5^rR}J-AuE47;g!T^H8uo@gnyMtk~_J<+=4Ofa{h8KG(9206SdT`M_)`sDQoKk#6!
zgy&`Bb|JT%_o{NKmPbi@Q*H#o*o_`HkJ6&!vH|dPNx}T!9qnS`Qpb%1ZPnhCPu+Mp
z4DmSk0gtun8y!`<0J-<>gvv3U*7SqZJxJF-MkJ;E9BlLC5x;tlXUU1_hgn)1sZZ&b
zv2@t<9MX0m&FT+m1kAm9v3ow6Kj1}EU=Qb9no^_AaLVdyTrQp(QJhX@LUBXSo!PKC
z+PoQS-Z;%0Y!V0pc=410kFQ)Pn!Gg^ON5cEuwWXRPTr*rKa7y^B)({U!}O8Wzd$8}
zOUCYWZq75LQUzD(E9>%m3_ukBNEf5xrY?8<9lBgYy0Azit0$P<4k5HLd#n3R(#>cf
zrmwo+^6&vW@HyQ$O>ht`>{0s=Z75cL9~e1(Huh5|B|D7(v^eSwrBdpBNEIicOAzuM
zj!3S^g=+6X?Nl#f)4@Kk+LP0ZqS1^l)rK&90#hf}MNowqhB;FVbJm~=rvK)PPrWGb
z-NT%z7~k7)hziYS5axj}D4w!({Td|j`hOMwNG6Z@(*AKJtI+xU<DD1KCilN+`iDn-
z2G7@;3M4iR%?2E7f3h)RF?mk*-ef05WHRk|u*U6t6-Ojx8pY}<G;ShTV`&Sg_o_R+
z>hs!nv4&?`EwJ&N0WMoYD#h?M$bO!^-LPFuFJY$5N2BlOB%|%n1@jE!8vWCw?gL9a
zZ5+!sFdqCcAN@TUn(+Rv0*_}nhNbU-{*3rR={$ZshvYBB50>8&FCJw~hCVbt(ZIA=
zeU?3%q;qdHziK}zwspdc9!z7SW1dG}M=QY5)env5n!C|DSQYL=g1LbF?I9wKIXWH=
zr}ntEzBZgc1eMhf@NkaW6FIIPm&kE9<xt<JvmP^GT2J`13&i`bW$Vo`%OGZ<FZrj&
z*_ilwA8x<sm?D&Ho;$f7qV;+*bEh}5C|8aYq@$!sIHc;06r}RA7v9KP?6LbWh<fn^
zE^>$DjbIy5O?G<GPjSZi3hnqos6%r&1TCcC$O;a(e83BF-Ara;(@`Wt5<0&26tqSk
z%*H3vG616mypd)3Oqb}){irdi6xSuLiKzr8itxh>rdeDgbonwUL}O)!YpK4*@D%8Y
zsx8O!a`Q;ZY^L>YxH1&}AfW}c=c?<MGQSO>IiZ)2j$Aq+0HRD8Cl9cCV2JHA#F&{A
z;;?nzi{^svs0fpBiuNEAGM<df(5+$;5=?DWh)ImM(V4F$Dnm^YF99v`EhZC-loe2D
zv6>KUw)|YkTKUZ{m_Hx&yhB1g|7&R3cF1<!(*JWK?os2AcOcIXk;n88W+2iCJ22Er
z$xiJr`wcIFI;KCk@tksyyJ$Z%nnfC<8+-!xTZ>JHnYXfX;E+(2mqWELz_}Un1ae7M
z;H@ao>U){}(Zqbm^fM;F^fCzF%!G4~=YDn`Cqo(f1K5?&lwKp=6y`kR3FivRMSOpO
z&ay5F&)FvgKhb+>XCr*9X0eJ#p3e-3!7FLgz7KxyirB-ar#8=bsk;^@eKS4Wo$6BU
zo=6fls~4%s`;;^i=m~$C7JNYqkv#OHm58><i4m=4m-ZmESseLhswY~I>QU#X_W#Ko
z-<B_PZIj@~^bp=SJ}^KJoK=&fZO&fubk*3!m!l6GcofY<oA8e!5#v-Ui7_Uo$Pog9
zN)e8(|8(3xUEwoRn^(BiUe|UTSX|+qsj^LzBeeTIs6vMd+g=JfwO_Gm4<1(}YLzCN
zTcW$P?SG>=dx<l({{`Cr3GYhn|E*>Hu?%gu?b1Z=E(JS+>JE@B=XhR(eZWXmvkOmW
zjH8_F%)^)`FkQ3oKSKPGale=?VS+ewEB+e54BDSPj}&(PZI%86M6ku%DU#LR9ZbQZ
zEofi0OPgh<0hLx_vU*xRg<a>pVrMrNNiAu#umY>S|7i-H+DPKG)TjTyX%tKND+U%6
z@ezrR1usX*+EHs^7p~&xDYS#n;T%{u%BC~ami#!zc?wS`_OS9#TFU<~R{kd9wv>-z
zZ~#?~IFy-q?6kFHxp8?;eJJPcTaRV&K6$?;N4=>yP3`cAzkvrluiwIAEx81m`5EPE
zaCuI>CU)*bO>qpN1<D^#{>I81i}I+3IR~~9KRvvH==N?GwrM=kkwQPF`vdEbh8U(~
z%G;K4Rph+h=4)xF+5fH_b=#rGFjP-J$R?oVX4^<G)@W3E>uapkM?f*!gSA%?cyYcm
z2NR&ZtMp&Oa&iBq_CmX$%?$NhE=2{Peo)l*gAXDVnnkAW(w36UPBsZ(Yd7PJ(lG=F
zN@vG6-(R&FCFom`(d>_`{J%d-<-bbnzg7KzN;DSY0o?60`7U%YJyivFWbR|vOGq5!
zWg9L%IVUkgNQW<K{eOk_@!`JHSTujaHWfVTA;`%X(BV_5!(*9ZEZEu3LM>?%KK(hm
z@p@W9Dpz1A-HqB|r!pPS%L|1+QCC)z*!&8^YbtuGu_(Z~9vt%u@6IqrtzFtE$VzBK
z@vQ_WdOu&LwL#6uYIKJWXfx%K6g+Z!Lqc!46b4O0p<CfXF(r@WFb_Z%8LN#)roAXy
z5Lhx#3=v@!qY$^zuG&X`!M<Pa1;m4+Gw5Zf4%5n!44HFMdzx8%=T@o+IpcVoJp0Kd
zIJ<`K2c=$&A6(1nrlV^YuqI~pjn2J;_=cH$5Y7`rAPF?V`7<_r*lq=^e$O!qmll(^
zvFAc)trMt>H!}APYDes0VBQ!_iCu)!v73Mg(82LK%^$sLOxud8V3j=_uKj`b7!YrC
zLkj&R!PNY=_moLqtYxtwv=s7Syixg~&#w*cbA|4<3Bex9-paC<4!4DFfXAfl9AlIr
z^G8%@JagT6SZr^h+2cLCNok`E*&kUXnvm=S0b12F%=xj|p?E_W?}}&=DxxIR1ug19
zfN7^APRthC+eQLBN^Jir)har7G^*-V=e{`$ll7cLyzoY+OoaSDXM)SM12ZJS^%VW_
zmG-l^2nDsGhqz>ob)e4Q<DMx@_1KQdTYWVZO?c-*)>HI6&x6^<)&NPM(F$)XsHk>f
zcp8a(FhBVR!i>7R)d_7jQrL&Q|FsV@VL#MK6p;qT{-2;9zJ!e!buXUJXw8N$sHBY5
z5=y{%fEVFP)RW3-2*ebT&1tYi^+Xn=dTv;dE{5qZ0q7W|M_qxlE4k64Q*<)z)o@Hw
zj)r4bi*2o7z|NGW!M3!en@+2Lnr+U*nlPsu4;Hc4t6h#%WE8*aVC?Tkuqm)JIf_l%
zbLUR&zjEJ%5H3Ymdq_lTkDmU^PzVaTd*tXsJDh93+9UMH;iF0NbvQ5RiUje@{^{iC
zMwb7@D~}ub-$C7IPTljqnSYNb8ni>I=zd@5@r3`8<h>5^<?tM*urQi@t=QfVJIGPl
zE=ODN*8(G*+Hn|@HVrc15a`lk+xy_~M&>x>y?YUHkw!bPldz4q)3$ih2VPsuYkNog
z5zD1GQx`=y%z@u8w=KqYP#dUmQ{MY~WQRGl=dmuw(|h_8m|t_!UrCDyEobr2<th+y
z7-qPjkH?+Sf6WFE*dG^#Pp2u@;i>dQQ+U%qNN~^)jFTMw|8S%D-|vNA96~HdY05+T
zL`aj9Xz7D#1l73FsPPg@jr9wd8=<q#%|wva=0hZjz7`6yKgDx}Hl)O+1|6`MLqCEi
z4BD$;0VaCFyKQ<JN~`WP_k%Y>0g4i@wv=dx*?n*__4-msL$9BsB_S`{Fn$%iOe+Ld
z*#2fPo5x5vH~u~h`EpLOYNNA0Nrj<0!L3LmHa(q0U^|qB(*CE7`3lYhV?SECP^)C6
zDygTEXeSP8BbPo7L_V*1l?g^{y?|PP5(OmUPmxmPyrOhvnEpMWoxmmFnZe_7_-<JU
zVhym|r5-{VIMjMp`!!Pm^ON_XA?ZUJDkH;Je;})2iigJEeo>Hb1BSj$>u;6K?{Sd3
zelq*hmnj67u|47!yp!Hy19;EpNm|2h2yA~(k#b%#^V8E4^`sjTVxwQiY|<v@{Ui7;
zMRZH}v&@I^cPa6~)$pg33$rDP;L2z@lAd!?-v+G{JUF~~QvU@=(3R-{$-9{5=l`NN
zY|O#@z>7~QK6UtPz-JRa5C1><3{`$5BG1%+^7%2+{(t(6J&!(DgXTo|rg%cSj=}vf
zeEyl<rv}NP_)PpqIQ$ETw*&fpH4VZlLGcF^De>|kVR5idsh#4(n|!R)KuyK8X)^-B
zbpqW<L8Z2?R;l#|7&>znPne!-vdqkxMzpjE0jZ%L?+NrvHU7HB+0vW|fg984)qj$&
zp~+8T@H(6NGNJgUWuBGZTgwV=TDr8bphTEbFH8*vnx>+(CjV4=ArW3WGi3@10pPE>
z5ejPjinJ7OJ8Bi?H`P|uOA8uWgp#IKX(GxsxF<^04NcNI6o%^Hb{%`OQ5N<Mmj^1=
z_-9MtT(wNTX=%xnn~F<3H!WG6m6Zib$x_dfBDznLq=u&167hL&T2jQhkiQW2law02
zWbkGNCP_+zgg4^US5-7sNq9#R-WrsZhWu0NCF@nyAk{Z0oPkMDn(&$@ydFrZ_cxQV
zXjfA}KEE}a<gce!@1PoZ8Bb%AUtu+o8mgsAye%qFR}rX@{CI6rqd!1p77oZ;RU7!S
znWfAse{}`CU=mXUdeCK9lifmAV_iinG_MV?W|dH7iC#*?^)~o<Bf)&k5|W8qnqff3
zG*30v7&2??C4Y6b-=|Dw)~Rm5E32BxJOTf=gZ_G-KOn&?q$a-)FJQu(ovLQ1p=3!a
zEoJ&8>;XHJRv0w+Pm>~L&M)*%B5I|Dv$4YGCz{Wo;ayHuL7yLOBvl8S(7;W+2E@Z#
z#IQ3Fs*OzKSyHv%Uqv+D+-OXRwI)bS2Ai*<34XeUbXS5+^~9_gDR_BR?d=WqN=2Qd
zR8&&JdLsd5Q)=P<jBNNtY4(yOOORUGs`#bmTBSy6@KHv*FDmGlC@nLGd~v!|RlBBE
z39uTs$TA5`<f-wuR8;wWwRmY4&j}7A<Ft526qvT;rjo+hQfou7NeZ9?)=BHo_%#*l
z(N+q&cXNHbY2k|#0+XfYnp$6t6bu9rL|Ualun}*i@>jtvskfMJ0NmG9Tj{TY3pM$(
zB&oR0UlAb7RKw!XK2hMrfK=7s3$F9SJoNgkH0sh-=m3ZwQbi^Fi}?wEw-&UbG8^$W
zumJV*8bxWGJ#}hxb92_3`e0T=)0(M)hH9mm0!usyO%;Tte#%1q9Nn=V{fUZ_DuZi4
zXprV`F_ttq%588`CQ<QMtec9+hHC*{0X9%ysX}3qkHtO#x>u}+>a0Jq$Oa>=udSHP
z0+ci{Gp^JmC^I22F-^$LnwBfDcc4keE8->uC~#3}m{&+kmV3SE5o^}3%3dusR|KTS
ziU14_qck-H*VLewp?CUyQlJ&@@meQQY=>c{X5qzWfvG~BGDUbj^bkHj6n-+?FZ|>;
zc%9%xp&akEL!hasLx@MC8{bnZ>Y6KBDe8kX#pneC5R<_t_@=;3D*Xc9499}Ep{(UQ
z?Px6K!{RoV&JW;z#$iml@OcZLYw<|6%JTUgc8(s#&er)pA0v(Swszpt1|Hhqtiq>c
z2>$cQ_*XPHWX<58WDZ|OxkUQ`$~Dsn68)=utg`5S4dj!4Uq$A>lb6aI$?IU&$Atfm
zoc}5B4={J6@(7ZxJD|%$u)+C0ElAr3o+t1r$Nd&S8L$KJeEk0tS|enw<ez*FGdX++
z{%fWYB>GqRSY^?D4dj!~Uq$A>lb6*2_M<#zeN6c8$oZf0K7^eiDvu!9+7d3#dyC~A
zRw2gwq>}-$IY;M`+56v80cnAUfSx%4ld}ndG`c5{Sujbs1+SFE%O^1)f`o850A~}E
zFOnyNb#fvtjSm@ojG&O5CIFcdkKp-y#1T+%O~X1rA~Vf7jae{sqbto@>+{!R<SQ!n
zuAhG0Y>8&axQ~yN(=h>+FdSi6G)EzGAgeR72BxlQtjnrV*45pZl~zL2GW@5vR7&PZ
z$Hs3qYhq*!XxM<l%RgCVn*5m3DHx1{m`~JV&RRl4GRatSlXQz~=~CB{l3OtsGp4(E
zgC+)I34{7NvS1Ziu&$yRGhL%T0}N?c3|32{IpR<jrSt)oB}qfbA-(~;|AKD-@0XCv
z<$o!CO<e&0ZT-!1Oc`XK2AXZMNedJ$^4HVwYs|2Nc%$kX<{60=HJ!mav%w2hX^liv
zkxSo<#kyZZAHqTGe0)0b(eTN50|#^Q>FYy$q4XiH0`vW$Ft;?JN?Jhvw2aT3u+j=*
zokLTk$&#numql-aZNSRQ-%?W%#5AKyC@>avf@@iU$78JKFyWYr*Tt93n!(>44?h+P
zWY^MVg(WVp$F<DuSt?AJnT_)B1-)!nB;AmY4qk-&P5&Ev3%K9Z6^s22@L@oDhw|gw
zvHt*k$BtO+SwQcfP&a}-m<J%e6p;3c>i{<aj@^m50^kn7mjNH&6^ls-9>?(L{2{=H
zamFSYf#hYtY{1U|-GE~;FIfp#3RnlY0WbvkIN)Z$$(XNbfMYS2DM1jL3`lP;dlqmr
z;4#2Q0Y3xW0XX)hSgaRt4&a-B&jM25D#d(gEMOgAHsA)D9|4a22gW$S$$$!=7qA1c
z6!2j{I#0V5aMLTX*df4&0X4uKfS&=r4496fcnr`9IPz7@y#OZzdI7zFRe+`NjTQvX
z4S<^fKLdOe@MZYZA;8kNVzG}Y9WWhz{&7G$hqD7P7w|K{QozY?$6}2{2kZbG`3}Zs
zq66*#ECoCaxCv0ehV|osV*!r=&H&t?p`L)B0qzDY)nO;V$KOLb9(qoGAMF5G2e=9F
zS->5Db3Q=(;aw?Sz_EbrloI*U?Mnq)OS<ifk;79vZNt-vj*}&V{Kr`AIzaO}KffS2
z!9e_{pMbvb8^Mvjz>%>~9MPN_66Rfg!?n|$SCI_L@5ZMW{t9!(uXNne9;k-$IyhAV
zY{aK(TP%j%N<o<KNZ(|4IWjgTEpSNT<OPl`Hp;UZpH9e2fqxOtf7s_cGQOKs=#Zkx
z^BtL+Qe2Mgjl*1y-0<+lj^d;=dzvG+z>)28WX^X;U`3Ysj#Sr(B+2erS?nmUbgXna
ziXjUZ>Gd%_eSb>mOSDuBt}k0?lR=|rpoc;GIqn6QBYh+38cuRMq}$UR86dc*6iPH~
z<puxBr(&@m62a|A58LfcX`Ce=q&kv^^miydA<yHG>f`bXN7xs}5%&mtiCGY`DEK@9
z8Et=tPv9}ld2Qp4+h&>LxGm|P5suTgg^rNj?dY%<Iy&uTpjN?Pu;Czsxkn`ZFa_L;
zId>7bSAm<o^)QoS3=V8OhVuVKxkZk0`wty8Wsb%Lj+Xh3knL6w@*Opc9E}BzmO>D|
z<tX<;1*kemg#{xrA$~K;>clCQS-7XNxR1EVN9vh9(7Z^ZcIyW3&%ul5MC>BkA<&)}
zMAJaq0UF+e5$F31Gz~O7*NW59;g=tSmQ9qkj`U&xCur$7_Cofz)E(`{{V`#4_+y!4
zB`mPOQR8+rt~{TenLQ~+&w<Q0zKqO9zoP}MVq4(ou+4XL!hVe_94!T)6o9e<l%<Zw
zRp%{>?C~bb>PA@zKkOnKp9XCQXb%uYCL7Dt51EbaiX&qY>qCZ(ofs#waUkhpmfN7^
zf;I;<gdlcNIbP6mLCdhv%0Y93Hk#8YO#!VKwC@tl?I^b2ZS)dK>qOdaq<zOsyTeE$
z`Hz!)j9b<+yFsHfc6gG*E|PHwv}_vRh(hwen~-rFX}?1n$)k%Pjek#oX7!;A&~|`k
z+Kl8*25l>7=hIt8+GHHp`yL6UGVe{4Sw-@ZX4Sg|w8ufi83J~Z9-Bx$XjVIK0gcWi
zTJ!!6v~JK$n^N9=pgn8JOKC5Ib{I6$-MrG#e?JDjk7U9Y7Jo+Y{DMC(MA!Y?QFDu<
zalX-)=W`ca<|ua$5k>69X^t9s#5a*#^o1V2V#K#VU-|`l(TGaWi@!i$KBC%DGvCoz
z>ZoxIRb=6a8dhSHqoy#fC}Pa{6?Bbg1vf<U8r?jC?3YS&2Fz(BZYZ)D%}X@UT8M_;
zY%e$3l=@FD(!7}4yg+G*SYGVtwb>tw2XNO28bhnVD`3780w7+D3%9cX29(NaLwY&V
z>8ZMrzKj(_dTl{k71ErPR^~`2+V4OMfrjwKE(zcJK-&Nsi<xZfSq&LQBV<Em=I6)2
z^N>Xr^B)A#-+^{7Ny6Ze?s23NJp=T~n2RlB^g;)fOS)!*UIjYyTUM8wSyd>F=2bOF
z%c49*j`Rv%Ht9}puBEwMCZ#3pwb&tf92wxnP|D<Yg0BsHtPe2x#Y{fw^f=Nwkj7#-
z0u+gwgU@czp8!2f1dJC^nlEgkae8Ai2AFWlLPx$GV_qhr8%A(*dO+NQ7oTLz?*z;z
z?<7KEyg~kOa;?#p7;p+lERWyIBV4#&z+z<42-E<Y8e<Z*cM0TWL*A_<4{gy5I~0ys
z$?8GnDM)Wb`jUbDuPEOC67!oPN1x69`}20RMQr9V1M+s0JgjZ*pz;#>vsiv-Txa(P
zxGz_<koo0j$hQ^w@+lwl8T8rIg(H?h)5#!>MesX}^jj$17axb2UDleSC=HhzA20Y*
zvF7p<0eXC4-X_!BL^kGa`Az2?uc)2r9jw`qWBNCVqsD$5^i0qv5#j6WYYTjBfv+v_
zwFSPmz}FV|+5%r&;A;zfZGo>X@U;cLwg4<({vMtA`*Y^+&6&S1Xa1g?`TKF^@5PzF
z4`==!-29b>InCdDGk@RBG%{_6(`CZ=J{>J&ap92+yT%q9kp5<ZF7x;Et}svmTNvzO
zdqB7|e@Bn@6X-J2KRFj`Ap9Y|IL1~UyJW28>B6Hm<HG(fU05=+>l+;Bk1N<-3niF)
z-v*a)wt(*CyCg<3*Wm1zi$LMk60nuTE_46#QN96d(u;Y;O}$rgL0rvv`S@FAcA0!<
zV@Ca8PewY&@#EaEu|zt{cbwzZJpEISv&|tc`~M~|e-C}I%mv&qD>$s?a6N|`Ied`A
zM>y=_a1Vzsa`-lfCpjF(8|o4cui<bOhYL7d!C^Ir>p9%W;e#AL!eJMOdpLZN!?!s+
z$>A{kaTQ&caCi-evp8J9;R+6`Ib6@-Mh+k3@DUEXINZbGiyXeq;YkjMaYws^!)r{(
zGt~Oh->D&q@tVK8X!cvv|Gu;!&S>U0f3Go~pC|P3@~)qL{q*Xb=`&~fa%biEv;DrA
zl{2ULuAi2hJp&ZqtlSyXd{r~Es{A-nLo({_k1Y|h0yQ|Pf)lbrmT?YR$ii7_f0k>$
zXNpp>hGTR*rZQNIpQx{`64<HF8k~+6vZ`9^1Fh=}s5BWV{5<Laqzq|I{<;dv!0#IC
z6e<!w=$eJwtThd|VZYg%h2NL01ych~LsSS^{u=z2El#AD)l@-<i5XeTaQe5RRbV;H
zd&)&+K>*XMVqL8dH%wM#Ai&hZkFdf9I7+-WZp*K5L-CH9!i;0N{KkZ4d^L+O+tb8p
zADUvCnZJbJm{2kqIixLJ>vbg%Ykr02HzDnfTd%?SXCUz;VwzdL8TU<C#WS1Zz+gYV
z5$R+DGe3KlPkH!wAoBr(0M*^hPy6|FEx?CZ&HUy#V?uLWAzr!$+iwYI6tm6zW}G(R
zMwZJs%SN{*p9xoiMq_}9o8y29%PAAC!TK9i0Y5B6ziOM1YmQ4MT*(Cwwx3ylh3B8o
z1)AfW3C(el@>56}Y`?oeBb$(Zbg_dN7C1PJ4Q~Hd@LKa{^YOrhW;>E>y3BFUgl(V=
z$j=MR=FrraWyY6@n=m>ke?HG=!Xvq6P6L|dn$!md<u~U+CN$>*Cja32(^(4A-)w*L
z_tZ^TIjBI%6vW|A0Im6dUT!3q&}|Cl{DaH?&7k~RrNL;z<K_g5=Qr)fQQ?ocap1$d
zTYTPkoIR{b*xTec^PBK#B+%5#%x}&MPk+h$`;nLGZ{`;^NWgGyFaV$48VJ6n_?>a{
z3IO@8nctlMtmOG|JcM1Qf17%n&C-EXYx(B9Ql^f9i~Xgyam&8V{3d({RBL`ABpKYH
z0l+};EyeGQoA&@nmZ^V;=MRO9^erUZa!HnZx;=r<AQr}9=BM~<y$1Ua<u%K;^8GGk
MV75WR2cg3M0T1ZH7ytkO

literal 0
HcmV?d00001

diff --git a/scm-it/src/test/resources/diff/largefile/modified/v1/SvnDiffGenerator_forTest.java b/scm-it/src/test/resources/diff/largefile/modified/v1/SvnDiffGenerator_forTest.java
new file mode 100644
index 0000000000..f714a955c7
--- /dev/null
+++ b/scm-it/src/test/resources/diff/largefile/modified/v1/SvnDiffGenerator_forTest.java
@@ -0,0 +1,1230 @@
+package sonia.scm.repository.spi;
+
+import de.regnis.q.sequence.line.diff.QDiffGenerator;
+import de.regnis.q.sequence.line.diff.QDiffGeneratorFactory;
+import de.regnis.q.sequence.line.diff.QDiffManager;
+import de.regnis.q.sequence.line.diff.QDiffUniGenerator;
+import org.tmatesoft.svn.core.SVNErrorCode;
+import org.tmatesoft.svn.core.SVNErrorMessage;
+import org.tmatesoft.svn.core.SVNException;
+import org.tmatesoft.svn.core.SVNMergeRangeList;
+import org.tmatesoft.svn.core.SVNProperties;
+import org.tmatesoft.svn.core.SVNProperty;
+import org.tmatesoft.svn.core.SVNPropertyValue;
+import org.tmatesoft.svn.core.internal.util.SVNHashMap;
+import org.tmatesoft.svn.core.internal.util.SVNMergeInfoUtil;
+import org.tmatesoft.svn.core.internal.util.SVNPathUtil;
+import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions;
+import org.tmatesoft.svn.core.internal.wc.ISVNReturnValueCallback;
+import org.tmatesoft.svn.core.internal.wc.SVNErrorManager;
+import org.tmatesoft.svn.core.internal.wc.SVNFileUtil;
+import org.tmatesoft.svn.core.internal.wc2.ng.ISvnDiffGenerator;
+import org.tmatesoft.svn.core.internal.wc2.ng.SvnDiffCallback;
+import org.tmatesoft.svn.core.wc.ISVNOptions;
+import org.tmatesoft.svn.core.wc.SVNDiffOptions;
+import org.tmatesoft.svn.core.wc2.SvnTarget;
+import org.tmatesoft.svn.util.SVNLogType;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
+
+  protected static final String WC_REVISION_LABEL = "(working copy)";
+  protected static final String PROPERTIES_SEPARATOR = "___________________________________________________________________";
+  protected static final String HEADER_SEPARATOR = "===================================================================";
+  protected static final String HEADER_ENCODING = "UTF-8";
+
+  private SvnTarget originalTarget1;
+  private SvnTarget originalTarget2;
+  private SvnTarget baseTarget;
+  private SvnTarget relativeToTarget;
+  private SvnTarget repositoryRoot;
+  private String encoding;
+  private byte[] eol;
+  private boolean useGitFormat;
+  private boolean forcedBinaryDiff;
+
+  private boolean diffDeleted;
+  private boolean diffAdded;
+  private List<String> rawDiffOptions;
+  private boolean forceEmpty;
+
+  private Set<String> visitedPaths;
+  private String externalDiffCommand;
+  private SVNDiffOptions diffOptions;
+  private boolean fallbackToAbsolutePath;
+  private ISVNOptions options;
+  private boolean propertiesOnly;
+  private boolean ignoreProperties;
+
+  private String getDisplayPath(SvnTarget target) {
+    String relativePath;
+    if (baseTarget == null) {
+      relativePath = null;
+    } else {
+      String targetString = target.getPathOrUrlDecodedString();
+      String baseTargetString = baseTarget.getPathOrUrlDecodedString();
+      relativePath = getRelativePath(targetString, baseTargetString);
+    }
+
+    return relativePath != null ? relativePath : target.getPathOrUrlString();
+  }
+
+  private String getRelativeToRootPath(SvnTarget target, SvnTarget originalTarget) {
+    String relativePath;
+    if (repositoryRoot == null) {
+      relativePath = null;
+    } else {
+      if (repositoryRoot.isFile() == target.isFile()) {
+        String targetString = target.getPathOrUrlDecodedString();
+        String baseTargetString = repositoryRoot.getPathOrUrlDecodedString();
+        relativePath = getRelativePath(targetString, baseTargetString);
+      } else {
+        String targetString = target.getPathOrUrlDecodedString();
+        String baseTargetString = new File("").getAbsolutePath();
+        relativePath = getRelativePath(targetString, baseTargetString);
+      }
+    }
+
+    return relativePath != null ? relativePath : target.getPathOrUrlString();
+  }
+
+  private String getRelativePath(String targetString, String baseTargetString) {
+    if (targetString != null) {
+      targetString = targetString.replace(File.separatorChar, '/');
+    }
+    if (baseTargetString != null) {
+      baseTargetString = baseTargetString.replace(File.separatorChar, '/');
+    }
+
+    final String pathAsChild = SVNPathUtil.getPathAsChild(baseTargetString, targetString);
+    if (pathAsChild != null) {
+      return pathAsChild;
+    }
+    if (targetString.equals(baseTargetString)) {
+      return "";
+    }
+    return null;
+  }
+
+  private String getChildPath(String path, String relativeToPath) {
+    if (relativeToTarget == null) {
+      return null;
+    }
+
+    String relativePath = getRelativePath(path, relativeToPath);
+    if (relativePath == null) {
+      return path;
+    }
+
+    if (relativePath.length() > 0) {
+      return relativePath;
+    }
+
+    if (relativeToPath.equals(path)) {
+      return ".";
+    }
+
+    return null;
+  }
+
+  public SCMSvnDiffGenerator() {
+    this.originalTarget1 = null;
+    this.originalTarget2 = null;
+    this.visitedPaths = new HashSet<String>();
+    this.diffDeleted = true;
+    this.diffAdded = true;
+  }
+
+  public void setBaseTarget(SvnTarget baseTarget) {
+    this.baseTarget = baseTarget;
+  }
+
+  public void setUseGitFormat(boolean useGitFormat) {
+    this.useGitFormat = useGitFormat;
+  }
+
+  public void setOriginalTargets(SvnTarget originalTarget1, SvnTarget originalTarget2) {
+    this.originalTarget1 = originalTarget1;
+    this.originalTarget2 = originalTarget2;
+  }
+
+  public void setRelativeToTarget(SvnTarget relativeToTarget) {
+    this.relativeToTarget = relativeToTarget;
+  }
+
+  public void setAnchors(SvnTarget originalTarget1, SvnTarget originalTarget2) {
+    //anchors are not used
+  }
+
+  public void setRepositoryRoot(SvnTarget repositoryRoot) {
+    this.repositoryRoot = repositoryRoot;
+  }
+
+  public void setForceEmpty(boolean forceEmpty) {
+    this.forceEmpty = forceEmpty;
+  }
+
+  public void setEncoding(String encoding) {
+    this.encoding = encoding;
+  }
+
+  public String getEncoding() {
+    return encoding;
+  }
+
+  public String getGlobalEncoding() {
+    ISVNOptions options = getOptions();
+
+    if (options != null && options instanceof DefaultSVNOptions) {
+      DefaultSVNOptions defaultOptions = (DefaultSVNOptions) options;
+      return defaultOptions.getGlobalCharset();
+    }
+    return null;
+  }
+
+  public void setEOL(byte[] eol) {
+    this.eol = eol;
+  }
+
+  public byte[] getEOL() {
+    return eol;
+  }
+
+  public boolean isForcedBinaryDiff() {
+    return forcedBinaryDiff;
+  }
+
+  public void setForcedBinaryDiff(boolean forcedBinaryDiff) {
+    this.forcedBinaryDiff = forcedBinaryDiff;
+  }
+
+  public boolean isPropertiesOnly() {
+    return propertiesOnly;
+  }
+
+  public void setPropertiesOnly(boolean propertiesOnly) {
+    this.propertiesOnly = propertiesOnly;
+  }
+
+  public boolean isIgnoreProperties() {
+    return ignoreProperties;
+  }
+
+  public void setIgnoreProperties(boolean ignoreProperties) {
+    this.ignoreProperties = ignoreProperties;
+  }
+
+  public void displayDeletedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream) throws SVNException {
+  }
+
+  public void displayAddedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream) throws SVNException {
+  }
+
+  public void displayPropsChanged(SvnTarget target, String revision1, String revision2, boolean dirWasAdded, SVNProperties originalProps, SVNProperties propChanges, OutputStream outputStream) throws SVNException {
+    if (isIgnoreProperties()) {
+      return;
+    }
+    if (dirWasAdded && !isDiffAdded()) {
+      return;
+    }
+    ensureEncodingAndEOLSet();
+    String displayPath = getDisplayPath(target);
+
+    String targetString1 = originalTarget1.getPathOrUrlDecodedString();
+    String targetString2 = originalTarget2.getPathOrUrlDecodedString();
+
+    if (displayPath == null || displayPath.length() == 0) {
+      displayPath = ".";
+    }
+
+    if (useGitFormat) {
+      targetString1 = adjustRelativeToReposRoot(targetString1);
+      targetString2 = adjustRelativeToReposRoot(targetString2);
+    }
+
+    String newTargetString = displayPath;
+    String newTargetString1 = targetString1;
+    String newTargetString2 = targetString2;
+
+    String commonAncestor = SVNPathUtil.getCommonPathAncestor(newTargetString1, newTargetString2);
+    int commonLength = commonAncestor == null ? 0 : commonAncestor.length();
+
+    newTargetString1 = newTargetString1.substring(commonLength);
+    newTargetString2 = newTargetString2.substring(commonLength);
+
+    newTargetString1 = computeLabel(newTargetString, newTargetString1);
+    newTargetString2 = computeLabel(newTargetString, newTargetString2);
+
+    if (relativeToTarget != null) {
+      String relativeToPath = relativeToTarget.getPathOrUrlDecodedString();
+      String absolutePath = target.getPathOrUrlDecodedString();
+
+      String childPath = getChildPath(absolutePath, relativeToPath);
+      if (childPath == null) {
+        throwBadRelativePathException(absolutePath, relativeToPath);
+      }
+      String childPath1 = getChildPath(newTargetString1, relativeToPath);
+      if (childPath1 == null) {
+        throwBadRelativePathException(newTargetString1, relativeToPath);
+      }
+      String childPath2 = getChildPath(newTargetString2, relativeToPath);
+      if (childPath2 == null) {
+        throwBadRelativePathException(newTargetString2, relativeToPath);
+      }
+
+      displayPath = childPath;
+      newTargetString1 = childPath1;
+      newTargetString2 = childPath2;
+    }
+
+    boolean showDiffHeader = !visitedPaths.contains(displayPath);
+    if (showDiffHeader) {
+      String label1 = getLabel(newTargetString1, revision1);
+      String label2 = getLabel(newTargetString2, revision2);
+
+      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, false, fallbackToAbsolutePath, SvnDiffCallback.OperationKind.Modified);
+      visitedPaths.add(displayPath);
+      if (useGitFormat) {
+        displayGitDiffHeader(outputStream, SvnDiffCallback.OperationKind.Modified,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          null);
+      }
+      if (shouldStopDisplaying) {
+        return;
+      }
+
+//            if (useGitFormat) {
+//                String copyFromPath = null;
+//                SvnDiffCallback.OperationKind operationKind = SvnDiffCallback.OperationKind.Modified;
+//                label1 = getGitDiffLabel1(operationKind, targetString1, targetString2, copyFromPath, revision1);
+//                label2 = getGitDiffLabel2(operationKind, targetString1, targetString2, copyFromPath, revision2);
+//                displayGitDiffHeader(outputStream, operationKind,
+//                        getRelativeToRootPath(target, originalTarget1),
+//                        getRelativeToRootPath(target, originalTarget2),
+//                        copyFromPath);
+//            }
+
+      if (useGitFormat) {
+        displayGitHeaderFields(outputStream, target, revision1, revision2, SvnDiffCallback.OperationKind.Modified, null);
+      } else {
+        displayHeaderFields(outputStream, label1, label2);
+      }
+    }
+
+    displayPropertyChangesOn(useGitFormat ? getRelativeToRootPath(target, originalTarget1) : displayPath, outputStream);
+
+    displayPropDiffValues(outputStream, propChanges, originalProps);
+  }
+
+  private void throwBadRelativePathException(String displayPath, String relativeToPath) throws SVNException {
+    SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.BAD_RELATIVE_PATH, "Path ''{0}'' must be an immediate child of the directory ''{0}''",
+      displayPath, relativeToPath);
+    SVNErrorManager.error(errorMessage, SVNLogType.CLIENT);
+  }
+
+  private void displayGitHeaderFields(OutputStream outputStream, SvnTarget target, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+    String path1 = copyFromPath != null ? copyFromPath : getRelativeToRootPath(target, originalTarget1);
+    String path2 = getRelativeToRootPath(target, originalTarget2);
+
+    try {
+      displayString(outputStream, "--- ");
+      displayFirstGitLabelPath(outputStream, path1, revision1, operation);
+      displayEOL(outputStream);
+      displayString(outputStream, "+++ ");
+      displaySecondGitLabelPath(outputStream, path2, revision2, operation);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private String adjustRelativeToReposRoot(String targetString) {
+    if (repositoryRoot != null) {
+      String repositoryRootString = repositoryRoot.getPathOrUrlDecodedString();
+      String relativePath = getRelativePath(targetString, repositoryRootString);
+      return relativePath == null ? "" : relativePath;
+    }
+    return targetString;
+  }
+
+  private String computeLabel(String targetString, String originalTargetString) {
+    if (originalTargetString.length() == 0) {
+      return targetString;
+    } else if (originalTargetString.charAt(0) == '/') {
+      return targetString + "\t(..." + originalTargetString + ")";
+    } else {
+      return targetString + "\t(.../" + originalTargetString + ")";
+    }
+  }
+
+  public void displayContentChanged(SvnTarget target, File leftFile, File rightFile, String revision1, String revision2, String mimeType1, String mimeType2, SvnDiffCallback.OperationKind operation, File copyFromPath, SVNProperties originalProperties, SVNProperties propChanges, OutputStream outputStream) throws SVNException {
+    if (isPropertiesOnly()) {
+      return;
+    }
+    ensureEncodingAndEOLSet();
+    String displayPath = getDisplayPath(target);
+
+    String targetString1 = originalTarget1.getPathOrUrlDecodedString();
+    String targetString2 = originalTarget2.getPathOrUrlDecodedString();
+
+    if (useGitFormat) {
+      targetString1 = adjustRelativeToReposRoot(targetString1);
+      targetString2 = adjustRelativeToReposRoot(targetString2);
+    }
+
+    String newTargetString = displayPath;
+    String newTargetString1 = targetString1;
+    String newTargetString2 = targetString2;
+
+    String commonAncestor = SVNPathUtil.getCommonPathAncestor(newTargetString1, newTargetString2);
+    int commonLength = commonAncestor == null ? 0 : commonAncestor.length();
+
+    newTargetString1 = newTargetString1.substring(commonLength);
+    newTargetString2 = newTargetString2.substring(commonLength);
+
+    newTargetString1 = computeLabel(newTargetString, newTargetString1);
+    newTargetString2 = computeLabel(newTargetString, newTargetString2);
+
+    if (relativeToTarget != null) {
+      String relativeToPath = relativeToTarget.getPathOrUrlDecodedString();
+      String absolutePath = target.getPathOrUrlDecodedString();
+
+      String childPath = getChildPath(absolutePath, relativeToPath);
+      if (childPath == null) {
+        throwBadRelativePathException(absolutePath, relativeToPath);
+      }
+      String childPath1 = getChildPath(newTargetString1, relativeToPath);
+      if (childPath1 == null) {
+        throwBadRelativePathException(newTargetString1, relativeToPath);
+      }
+      String childPath2 = getChildPath(newTargetString2, relativeToPath);
+      if (childPath2 == null) {
+        throwBadRelativePathException(newTargetString2, relativeToPath);
+      }
+
+      displayPath = childPath;
+      newTargetString1 = childPath1;
+      newTargetString2 = childPath2;
+    }
+
+    String label1 = getLabel(newTargetString1, revision1);
+    String label2 = getLabel(newTargetString2, revision2);
+
+    boolean leftIsBinary = false;
+    boolean rightIsBinary = false;
+
+    if (mimeType1 != null) {
+      leftIsBinary = SVNProperty.isBinaryMimeType(mimeType1);
+    }
+    if (mimeType2 != null) {
+      rightIsBinary = SVNProperty.isBinaryMimeType(mimeType2);
+    }
+
+    if (!forcedBinaryDiff && (leftIsBinary || rightIsBinary)) {
+      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
+      if (useGitFormat) {
+        displayGitDiffHeader(outputStream, operation,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          null);
+      }
+      visitedPaths.add(displayPath);
+      if (shouldStopDisplaying) {
+        return;
+      }
+
+
+      displayBinary(mimeType1, mimeType2, outputStream, leftIsBinary, rightIsBinary);
+
+      return;
+    }
+
+    final String diffCommand = getExternalDiffCommand();
+    if (diffCommand != null) {
+      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
+      if (useGitFormat) {
+        displayGitDiffHeader(outputStream, operation,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          null);
+      }
+      visitedPaths.add(displayPath);
+      if (shouldStopDisplaying) {
+        return;
+      }
+
+      runExternalDiffCommand(outputStream, diffCommand, leftFile, rightFile, label1, label2);
+    } else {
+      internalDiff(target, outputStream, displayPath, leftFile, rightFile, label1, label2, operation, copyFromPath == null ? null : copyFromPath.getPath(), revision1, revision2);
+    }
+  }
+
+  private void displayBinary(String mimeType1, String mimeType2, OutputStream outputStream, boolean leftIsBinary, boolean rightIsBinary) throws SVNException {
+    displayCannotDisplayFileMarkedBinary(outputStream);
+
+    if (leftIsBinary && !rightIsBinary) {
+      displayMimeType(outputStream, mimeType1);
+    } else if (!leftIsBinary && rightIsBinary) {
+      displayMimeType(outputStream, mimeType2);
+    } else if (leftIsBinary && rightIsBinary) {
+      if (mimeType1.equals(mimeType2)) {
+        displayMimeType(outputStream, mimeType1);
+      } else {
+        displayMimeTypes(outputStream, mimeType1, mimeType2);
+      }
+    }
+  }
+
+  private void internalDiff(SvnTarget target, OutputStream outputStream, String displayPath, File file1, File file2, String label1, String label2, SvnDiffCallback.OperationKind operation, String copyFromPath, String revision1, String revision2) throws SVNException {
+    String header = getHeaderString(target, displayPath, file2 == null, file1 == null, operation, copyFromPath);
+    if (file2 == null && !isDiffDeleted()) {
+      try {
+        displayString(outputStream, header);
+      } catch (IOException e) {
+        wrapException(e);
+      }
+      visitedPaths.add(displayPath);
+      return;
+    }
+    if (file1 == null && !isDiffAdded()) {
+      try {
+        displayString(outputStream, header);
+      } catch (IOException e) {
+        wrapException(e);
+      }
+      visitedPaths.add(displayPath);
+      return;
+    }
+    String headerFields = getHeaderFieldsString(target, displayPath, label1, label2, revision1, revision2, operation, copyFromPath);
+
+    RandomAccessFile is1 = null;
+    RandomAccessFile is2 = null;
+    try {
+      is1 = file1 == null ? null : SVNFileUtil.openRAFileForReading(file1);
+      is2 = file2 == null ? null : SVNFileUtil.openRAFileForReading(file2);
+
+      QDiffUniGenerator.setup();
+      Map properties = new SVNHashMap();
+
+      properties.put(QDiffGeneratorFactory.IGNORE_EOL_PROPERTY, Boolean.valueOf(getDiffOptions().isIgnoreEOLStyle()));
+      properties.put(QDiffGeneratorFactory.EOL_PROPERTY, new String(getEOL()));
+      if (getDiffOptions().isIgnoreAllWhitespace()) {
+        properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_ALL_SPACE);
+      } else if (getDiffOptions().isIgnoreAmountOfWhitespace()) {
+        properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_SPACE_CHANGE);
+      }
+
+      final String diffHeader;
+      if (forceEmpty || useGitFormat) {
+        displayString(outputStream, header);
+        diffHeader = headerFields;
+
+        visitedPaths.add(displayPath);
+      } else {
+        diffHeader = header + headerFields;
+      }
+      QDiffGenerator generator = new QDiffUniGenerator(properties, diffHeader);
+      EmptyDetectionOutputStream emptyDetectionOutputStream = new EmptyDetectionOutputStream(outputStream);
+      QDiffManager.generateTextDiff(is1, is2, emptyDetectionOutputStream, generator);
+      if (emptyDetectionOutputStream.isSomethingWritten()) {
+        visitedPaths.add(displayPath);
+      }
+      emptyDetectionOutputStream.flush();
+    } catch (IOException e) {
+      SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, e.getMessage());
+      SVNErrorManager.error(err, e, SVNLogType.DEFAULT);
+    } finally {
+      SVNFileUtil.closeFile(is1);
+      SVNFileUtil.closeFile(is2);
+    }
+  }
+
+  private String getHeaderFieldsString(SvnTarget target, String displayPath, String label1, String label2, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+    final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    try {
+      if (useGitFormat) {
+        displayGitHeaderFields(byteArrayOutputStream, target, revision1, revision2, operation, copyFromPath);
+      } else {
+        displayHeaderFields(byteArrayOutputStream, label1, label2);
+      }
+    } catch (SVNException e) {
+      SVNFileUtil.closeFile(byteArrayOutputStream);
+
+      try {
+        byteArrayOutputStream.writeTo(byteArrayOutputStream);
+      } catch (IOException e1) {
+      }
+
+      throw e;
+    }
+
+    try {
+      byteArrayOutputStream.close();
+      return byteArrayOutputStream.toString(HEADER_ENCODING);
+    } catch (IOException e) {
+      return "";
+    }
+  }
+
+  private String getHeaderString(SvnTarget target, String displayPath, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+    final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    try {
+      boolean stopDisplaying = displayHeader(byteArrayOutputStream, displayPath, deleted, added, operation);
+      if (useGitFormat) {
+        displayGitDiffHeader(byteArrayOutputStream, operation,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          copyFromPath);
+      }
+    } catch (SVNException e) {
+      SVNFileUtil.closeFile(byteArrayOutputStream);
+
+      try {
+        byteArrayOutputStream.writeTo(byteArrayOutputStream);
+      } catch (IOException e1) {
+      }
+
+      throw e;
+    }
+
+    try {
+      byteArrayOutputStream.close();
+      return byteArrayOutputStream.toString(HEADER_ENCODING);
+    } catch (IOException e) {
+      return "";
+    }
+  }
+
+  private void runExternalDiffCommand(OutputStream outputStream, final String diffCommand, File file1, File file2, String label1, String label2) throws SVNException {
+    final List<String> args = new ArrayList<String>();
+    args.add(diffCommand);
+    if (rawDiffOptions != null) {
+      args.addAll(rawDiffOptions);
+    } else {
+      Collection svnDiffOptionsCollection = getDiffOptions().toOptionsCollection();
+      args.addAll(svnDiffOptionsCollection);
+      args.add("-u");
+    }
+
+    if (label1 != null) {
+      args.add("-L");
+      args.add(label1);
+    }
+
+    if (label2 != null) {
+      args.add("-L");
+      args.add(label2);
+    }
+
+    boolean tmpFile1 = false;
+    boolean tmpFile2 = false;
+    if (file1 == null) {
+      file1 = SVNFileUtil.createTempFile("svn.", ".tmp");
+      tmpFile1 = true;
+    }
+    if (file2 == null) {
+      file2 = SVNFileUtil.createTempFile("svn.", ".tmp");
+      tmpFile2 = true;
+    }
+
+    String file1Path = file1.getAbsolutePath().replace(File.separatorChar, '/');
+    String file2Path = file2.getAbsolutePath().replace(File.separatorChar, '/');
+
+    args.add(file1Path);
+    args.add(file2Path);
+    try {
+      final Writer writer = new OutputStreamWriter(outputStream, getEncoding());
+
+      SVNFileUtil.execCommand(args.toArray(new String[args.size()]), true,
+        new ISVNReturnValueCallback() {
+
+          public void handleReturnValue(int returnValue) throws SVNException {
+            if (returnValue != 0 && returnValue != 1) {
+              SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.EXTERNAL_PROGRAM,
+                "''{0}'' returned {1}", new Object[]{diffCommand, String.valueOf(returnValue)});
+              SVNErrorManager.error(err, SVNLogType.DEFAULT);
+            }
+          }
+
+          public void handleChar(char ch) throws SVNException {
+            try {
+              writer.write(ch);
+            } catch (IOException ioe) {
+              SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, ioe.getMessage());
+              SVNErrorManager.error(err, ioe, SVNLogType.DEFAULT);
+            }
+          }
+
+          public boolean isHandleProgramOutput() {
+            return true;
+          }
+        });
+
+      writer.flush();
+    } catch (IOException ioe) {
+      SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, ioe.getMessage());
+      SVNErrorManager.error(err, ioe, SVNLogType.DEFAULT);
+    } finally {
+      try {
+        if (tmpFile1) {
+          SVNFileUtil.deleteFile(file1);
+        }
+        if (tmpFile2) {
+          SVNFileUtil.deleteFile(file2);
+        }
+      } catch (SVNException e) {
+        // skip
+      }
+    }
+  }
+
+  private String getExternalDiffCommand() {
+    return externalDiffCommand;
+  }
+
+  private void displayMimeType(OutputStream outputStream, String mimeType) throws SVNException {
+    try {
+      displayString(outputStream, SVNProperty.MIME_TYPE);
+      displayString(outputStream, " = ");
+      displayString(outputStream, mimeType);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayMimeTypes(OutputStream outputStream, String mimeType1, String mimeType2) throws SVNException {
+    try {
+      displayString(outputStream, SVNProperty.MIME_TYPE);
+      displayString(outputStream, " = (");
+      displayString(outputStream, mimeType1);
+      displayString(outputStream, ", ");
+      displayString(outputStream, mimeType2);
+      displayString(outputStream, ")");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayCannotDisplayFileMarkedBinary(OutputStream outputStream) throws SVNException {
+    try {
+      displayString(outputStream, "Cannot display: file marked as a binary type.");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void ensureEncodingAndEOLSet() {
+    if (getEOL() == null) {
+      setEOL(SVNProperty.EOL_LF_BYTES);
+    }
+    if (getEncoding() == null) {
+      final ISVNOptions options = getOptions();
+      if (options != null && options.getNativeCharset() != null) {
+        setEncoding(options.getNativeCharset());
+      } else {
+        setEncoding("UTF-8");
+      }
+    }
+  }
+
+  private void displayPropDiffValues(OutputStream outputStream, SVNProperties diff, SVNProperties baseProps) throws SVNException {
+    for (Iterator changedPropNames = diff.nameSet().iterator(); changedPropNames.hasNext(); ) {
+      String name = (String) changedPropNames.next();
+      SVNPropertyValue originalValue = baseProps != null ? baseProps.getSVNPropertyValue(name) : null;
+      SVNPropertyValue newValue = diff.getSVNPropertyValue(name);
+      String headerFormat = null;
+
+      if (originalValue == null) {
+        headerFormat = "Added: ";
+      } else if (newValue == null) {
+        headerFormat = "Deleted: ";
+      } else {
+        headerFormat = "Modified: ";
+      }
+
+      try {
+        displayString(outputStream, (headerFormat + name));
+        displayEOL(outputStream);
+        if (SVNProperty.MERGE_INFO.equals(name)) {
+          displayMergeInfoDiff(outputStream, originalValue == null ? null : originalValue.getString(), newValue == null ? null : newValue.getString());
+          continue;
+        }
+
+        byte[] originalValueBytes = getPropertyAsBytes(originalValue, getEncoding());
+        byte[] newValueBytes = getPropertyAsBytes(newValue, getEncoding());
+
+        if (originalValueBytes == null) {
+          originalValueBytes = new byte[0];
+        } else {
+          originalValueBytes = maybeAppendEOL(originalValueBytes);
+        }
+
+        boolean newValueHadEol = newValueBytes != null && newValueBytes.length > 0 &&
+          (newValueBytes[newValueBytes.length - 1] == SVNProperty.EOL_CR_BYTES[0] ||
+            newValueBytes[newValueBytes.length - 1] == SVNProperty.EOL_LF_BYTES[0]);
+
+        if (newValueBytes == null) {
+          newValueBytes = new byte[0];
+        } else {
+          newValueBytes = maybeAppendEOL(newValueBytes);
+        }
+
+        QDiffUniGenerator.setup();
+        Map properties = new SVNHashMap();
+
+        properties.put(QDiffGeneratorFactory.IGNORE_EOL_PROPERTY, Boolean.valueOf(getDiffOptions().isIgnoreEOLStyle()));
+        properties.put(QDiffGeneratorFactory.EOL_PROPERTY, new String(getEOL()));
+        properties.put(QDiffGeneratorFactory.HUNK_DELIMITER, "##");
+        if (getDiffOptions().isIgnoreAllWhitespace()) {
+          properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_ALL_SPACE);
+        } else if (getDiffOptions().isIgnoreAmountOfWhitespace()) {
+          properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_SPACE_CHANGE);
+        }
+
+        QDiffGenerator generator = new QDiffUniGenerator(properties, "");
+        Writer writer = new OutputStreamWriter(outputStream, getEncoding());
+        QDiffManager.generateTextDiff(new ByteArrayInputStream(originalValueBytes), new ByteArrayInputStream(newValueBytes),
+          null, writer, generator);
+        writer.flush();
+        if (!newValueHadEol) {
+          displayString(outputStream, "\\ No newline at end of property");
+          displayEOL(outputStream);
+        }
+      } catch (IOException e) {
+        wrapException(e);
+      }
+    }
+
+  }
+
+  private byte[] maybeAppendEOL(byte[] buffer) {
+    if (buffer.length == 0) {
+      return buffer;
+    }
+
+    byte lastByte = buffer[buffer.length - 1];
+    if (lastByte == SVNProperty.EOL_CR_BYTES[0]) {
+      return buffer;
+    } else if (lastByte != SVNProperty.EOL_LF_BYTES[0]) {
+      final byte[] newBuffer = new byte[buffer.length + getEOL().length];
+      System.arraycopy(buffer, 0, newBuffer, 0, buffer.length);
+      System.arraycopy(getEOL(), 0, newBuffer, buffer.length, getEOL().length);
+      return newBuffer;
+    } else {
+      return buffer;
+    }
+  }
+
+  private String getGitDiffLabel1(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision) {
+    if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+      return getLabel("a/" + path1, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+      return getLabel("a/" + copyFromPath, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+      return getLabel("/dev/null", revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+      return getLabel("a/" + path1, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+      return getLabel("a/" + copyFromPath, revision);
+    }
+    throw new IllegalArgumentException("Unsupported operation: " + operationKind);
+  }
+
+  private String getGitDiffLabel2(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision) {
+    if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+      return getLabel("/dev/null", revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+      return getLabel("b/" + path2, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+      return getLabel("b/" + path2, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+      return getLabel("b/" + path2, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+      return getLabel("b/" + path2, revision);
+    }
+    throw new IllegalArgumentException("Unsupported operation: " + operationKind);
+  }
+
+  private void displayGitDiffHeader(OutputStream outputStream, SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath) throws SVNException {
+    if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+      displayGitDiffHeaderDeleted(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+      displayGitDiffHeaderCopied(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+      displayGitDiffHeaderAdded(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+      displayGitDiffHeaderModified(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+      displayGitDiffHeaderRenamed(outputStream, path1, path2, copyFromPath);
+    }
+  }
+
+  private void displayGitDiffHeaderAdded(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, path1);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "new file mode 10644");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayGitDiffHeaderDeleted(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, path1);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "deleted file mode 10644");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayGitDiffHeaderCopied(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, copyFromPath);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "copy from ");
+      displayString(outputStream, copyFromPath);
+      displayEOL(outputStream);
+      displayString(outputStream, "copy to ");
+      displayString(outputStream, path2);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayGitDiffHeaderRenamed(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, copyFromPath);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "rename from ");
+      displayString(outputStream, copyFromPath);
+      displayEOL(outputStream);
+      displayString(outputStream, "rename to ");
+      displayString(outputStream, path2);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayGitDiffHeaderModified(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, path1);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayFirstGitPath(OutputStream outputStream, String path1) throws IOException {
+    displayGitPath(outputStream, path1, "a/", false);
+  }
+
+  private void displaySecondGitPath(OutputStream outputStream, String path2) throws IOException {
+    displayGitPath(outputStream, path2, "b/", false);
+  }
+
+  private void displayFirstGitLabelPath(OutputStream outputStream, String path1, String revision1, SvnDiffCallback.OperationKind operation) throws IOException {
+    String pathPrefix = "a/";
+    if (operation == SvnDiffCallback.OperationKind.Added) {
+      path1 = "/dev/null";
+      pathPrefix = "";
+    }
+    displayGitPath(outputStream, getLabel(path1, revision1), pathPrefix, true);
+  }
+
+  private void displaySecondGitLabelPath(OutputStream outputStream, String path2, String revision2, SvnDiffCallback.OperationKind operation) throws IOException {
+    String pathPrefix = "b/";
+    if (operation == SvnDiffCallback.OperationKind.Deleted) {
+      path2 = "/dev/null";
+      pathPrefix = "";
+    }
+    displayGitPath(outputStream, getLabel(path2, revision2), pathPrefix, true);
+  }
+
+  private void displayGitPath(OutputStream outputStream, String path1, String pathPrefix, boolean label) throws IOException {
+//        if (!label && path1.length() == 0) {
+//            displayString(outputStream, ".");
+//        } else {
+    displayString(outputStream, pathPrefix);
+    displayString(outputStream, path1);
+//        }
+  }
+
+  private String getAdjustedPathWithLabel(String displayPath, String path, String revision, String commonAncestor) {
+    String adjustedPath = getAdjustedPath(displayPath, path, commonAncestor);
+    return getLabel(adjustedPath, revision);
+  }
+
+  private String getAdjustedPath(String displayPath, String path1, String commonAncestor) {
+    String adjustedPath = getRelativePath(path1, commonAncestor);
+
+    if (adjustedPath == null || adjustedPath.length() == 0) {
+      adjustedPath = displayPath;
+    } else if (adjustedPath.charAt(0) == '/') {
+      adjustedPath = displayPath + "\t(..." + adjustedPath + ")";
+    } else {
+      adjustedPath = displayPath + "\t(.../" + adjustedPath + ")";
+    }
+    return adjustedPath;
+    //TODO: respect relativeToDir
+  }
+
+  protected String getLabel(String path, String revToken) {
+    revToken = revToken == null ? WC_REVISION_LABEL : revToken;
+    return path + "\t" + revToken;
+  }
+
+  protected boolean displayHeader(OutputStream os, String path, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation) throws SVNException {
+    try {
+      if (deleted && !isDiffDeleted()) {
+        displayString(os, "Index: ");
+        displayString(os, path);
+        displayString(os, " (deleted)");
+        displayEOL(os);
+        displayString(os, HEADER_SEPARATOR);
+        displayEOL(os);
+        return true;
+      }
+      if (added && !isDiffAdded()) {
+        displayString(os, "Index: ");
+        displayString(os, path);
+        displayString(os, " (added)");
+        displayEOL(os);
+        displayString(os, HEADER_SEPARATOR);
+        displayEOL(os);
+        return true;
+      }
+      displayString(os, "Index: ");
+      displayString(os, path);
+      displayEOL(os);
+      displayString(os, HEADER_SEPARATOR);
+      displayEOL(os);
+      return false;
+    } catch (IOException e) {
+      wrapException(e);
+    }
+    return false;
+  }
+
+  protected void displayHeaderFields(OutputStream os, String label1, String label2) throws SVNException {
+    try {
+      displayString(os, "--- ");
+      displayString(os, label1);
+      displayEOL(os);
+      displayString(os, "+++ ");
+      displayString(os, label2);
+      displayEOL(os);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayPropertyChangesOn(String path, OutputStream outputStream) throws SVNException {
+    try {
+      displayEOL(outputStream);
+      displayString(outputStream, ("Property changes on: " + (useLocalFileSeparatorChar() ? path.replace('/', File.separatorChar) : path)));
+      displayEOL(outputStream);
+      displayString(outputStream, PROPERTIES_SEPARATOR);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private byte[] getPropertyAsBytes(SVNPropertyValue value, String encoding) {
+    if (value == null) {
+      return null;
+    }
+    if (value.isString()) {
+      try {
+        return value.getString().getBytes(encoding);
+      } catch (UnsupportedEncodingException e) {
+        return value.getString().getBytes();
+      }
+    }
+    return value.getBytes();
+  }
+
+  private void displayMergeInfoDiff(OutputStream outputStream, String oldValue, String newValue) throws SVNException, IOException {
+    Map oldMergeInfo = null;
+    Map newMergeInfo = null;
+    if (oldValue != null) {
+      oldMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(oldValue), null);
+    }
+    if (newValue != null) {
+      newMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(newValue), null);
+    }
+
+    Map deleted = new TreeMap();
+    Map added = new TreeMap();
+    SVNMergeInfoUtil.diffMergeInfo(deleted, added, oldMergeInfo, newMergeInfo, true);
+
+    for (Iterator paths = deleted.keySet().iterator(); paths.hasNext(); ) {
+      String path = (String) paths.next();
+      SVNMergeRangeList rangeList = (SVNMergeRangeList) deleted.get(path);
+      displayString(outputStream, ("   Reverse-merged " + path + ":r"));
+      displayString(outputStream, rangeList.toString());
+      displayEOL(outputStream);
+    }
+
+    for (Iterator paths = added.keySet().iterator(); paths.hasNext(); ) {
+      String path = (String) paths.next();
+      SVNMergeRangeList rangeList = (SVNMergeRangeList) added.get(path);
+      displayString(outputStream, ("   Merged " + path + ":r"));
+      displayString(outputStream, rangeList.toString());
+      displayEOL(outputStream);
+    }
+  }
+
+  private boolean useLocalFileSeparatorChar() {
+    return true;
+  }
+
+  public boolean isDiffDeleted() {
+    return diffDeleted;
+  }
+
+  public boolean isDiffAdded() {
+    return diffAdded;
+  }
+
+  private void wrapException(IOException e) throws SVNException {
+    SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, e);
+    SVNErrorManager.error(errorMessage, e, SVNLogType.WC);
+  }
+
+  private void displayString(OutputStream outputStream, String s) throws IOException {
+    outputStream.write(s.getBytes(HEADER_ENCODING));
+  }
+
+  private void displayEOL(OutputStream os) throws IOException {
+    os.write(getEOL());
+  }
+
+  public SVNDiffOptions getDiffOptions() {
+    if (diffOptions == null) {
+      diffOptions = new SVNDiffOptions();
+    }
+    return diffOptions;
+  }
+
+  public void setExternalDiffCommand(String externalDiffCommand) {
+    this.externalDiffCommand = externalDiffCommand;
+  }
+
+  public void setRawDiffOptions(List<String> rawDiffOptions) {
+    this.rawDiffOptions = rawDiffOptions;
+  }
+
+  public void setDiffOptions(SVNDiffOptions diffOptions) {
+    this.diffOptions = diffOptions;
+  }
+
+  public void setDiffDeleted(boolean diffDeleted) {
+    this.diffDeleted = diffDeleted;
+  }
+
+  public void setDiffAdded(boolean diffAdded) {
+    this.diffAdded = diffAdded;
+  }
+
+  public void setBasePath(File absoluteFile) {
+    setBaseTarget(SvnTarget.fromFile(absoluteFile));
+  }
+
+  public void setFallbackToAbsolutePath(boolean fallbackToAbsolutePath) {
+    this.fallbackToAbsolutePath = fallbackToAbsolutePath;
+  }
+
+  public void setOptions(ISVNOptions options) {
+    this.options = options;
+  }
+
+  public ISVNOptions getOptions() {
+    return options;
+  }
+
+  private class EmptyDetectionOutputStream extends OutputStream {
+
+    private final OutputStream outputStream;
+    private boolean somethingWritten;
+
+    public EmptyDetectionOutputStream(OutputStream outputStream) {
+      this.outputStream = outputStream;
+      this.somethingWritten = false;
+    }
+
+    public boolean isSomethingWritten() {
+      return somethingWritten;
+    }
+
+    @Override
+    public void write(int c) throws IOException {
+      somethingWritten = true;
+      outputStream.write(c);
+    }
+
+    @Override
+    public void write(byte[] bytes) throws IOException {
+      somethingWritten = bytes.length > 0;
+      outputStream.write(bytes);
+    }
+
+    @Override
+    public void write(byte[] bytes, int offset, int length) throws IOException {
+      somethingWritten = length > 0;
+      outputStream.write(bytes, offset, length);
+    }
+
+    @Override
+    public void flush() throws IOException {
+      outputStream.flush();
+    }
+
+    @Override
+    public void close() throws IOException {
+      outputStream.close();
+    }
+  }
+}
diff --git a/scm-it/src/test/resources/diff/largefile/modified/v2/SvnDiffGenerator_forTest.java b/scm-it/src/test/resources/diff/largefile/modified/v2/SvnDiffGenerator_forTest.java
new file mode 100644
index 0000000000..c46ce5f534
--- /dev/null
+++ b/scm-it/src/test/resources/diff/largefile/modified/v2/SvnDiffGenerator_forTest.java
@@ -0,0 +1,1234 @@
+package sonia.scm.repository.spi;
+
+import de.regnis.q.sequence.line.diff.QDiffGenerator;
+import de.regnis.q.sequence.line.diff.QDiffGeneratorFactory;
+import de.regnis.q.sequence.line.diff.QDiffManager;
+import de.regnis.q.sequence.line.diff.QDiffUniGenerator;
+import org.tmatesoft.svn.core.SVNErrorCode;
+import org.tmatesoft.svn.core.SVNErrorMessage;
+import org.tmatesoft.svn.core.SVNException;
+import org.tmatesoft.svn.core.SVNMergeRangeList;
+import org.tmatesoft.svn.core.SVNProperties;
+import org.tmatesoft.svn.core.SVNProperty;
+import org.tmatesoft.svn.core.SVNPropertyValue;
+import org.tmatesoft.svn.core.internal.util.SVNHashMap;
+import org.tmatesoft.svn.core.internal.util.SVNMergeInfoUtil;
+import org.tmatesoft.svn.core.internal.util.SVNPathUtil;
+import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions;
+import org.tmatesoft.svn.core.internal.wc.ISVNReturnValueCallback;
+import org.tmatesoft.svn.core.internal.wc.SVNErrorManager;
+import org.tmatesoft.svn.core.internal.wc.SVNFileUtil;
+import org.tmatesoft.svn.core.internal.wc2.ng.ISvnDiffGenerator;
+import org.tmatesoft.svn.core.internal.wc2.ng.SvnDiffCallback;
+import org.tmatesoft.svn.core.wc.ISVNOptions;
+import org.tmatesoft.svn.core.wc.SVNDiffOptions;
+import org.tmatesoft.svn.core.wc2.SvnTarget;
+import org.tmatesoft.svn.util.SVNLogType;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
+
+  protected static final String WC_REVISION_LABEL = "(working copy)";
+  protected static final String PROPERTIES_SEPARATOR = "___________________________________________________________________";
+  protected static final String HEADER_SEPARATOR = "===================================================================";
+  protected static final String HEADER_ENCODING = "UTF-8";
+
+  private SvnTarget originalTarget1;
+  private SvnTarget originalTarget2;
+  private SvnTarget baseTarget;
+  private SvnTarget relativeToTarget;
+  private SvnTarget repositoryRoot;
+  private String encoding;
+  private byte[] eol;
+  private boolean useGitFormat;
+  private boolean forcedBinaryDiff;
+
+  private boolean diffDeleted;
+  private boolean diffAdded;
+  private List<String> rawDiffOptions;
+  private boolean forceEmpty;
+
+  private Set<String> visitedPaths;
+  private String externalDiffCommand;
+  private SVNDiffOptions diffOptions;
+  private boolean fallbackToAbsolutePath;
+  private ISVNOptions options;
+  private boolean propertiesOnly;
+  private boolean ignoreProperties;
+
+  private String getDisplayPath(SvnTarget target) {
+    String relativePath;
+    if (baseTarget == null) {
+      relativePath = null;
+    } else {
+      String targetString = target.getPathOrUrlDecodedString();
+      String baseTargetString = baseTarget.getPathOrUrlDecodedString();
+      relativePath = getRelativePath(targetString, baseTargetString);
+    }
+
+    return relativePath != null ? relativePath : target.getPathOrUrlString();
+  }
+
+  private String getRelativeToRootPath(SvnTarget target, SvnTarget originalTarget) {
+    String relativePath;
+    if (repositoryRoot == null) {
+      relativePath = null;
+    } else {
+      if (repositoryRoot.isFile() == target.isFile()) {
+        String targetString = target.getPathOrUrlDecodedString();
+        String baseTargetString = repositoryRoot.getPathOrUrlDecodedString();
+        relativePath = getRelativePath(targetString, baseTargetString);
+      } else {
+        String targetString = target.getPathOrUrlDecodedString();
+        String baseTargetString = new File("").getAbsolutePath();
+        relativePath = getRelativePath(targetString, baseTargetString);
+      }
+    }
+
+    return relativePath != null ? relativePath : target.getPathOrUrlString();
+  }
+
+  private String getRelativePath(String targetString, String baseTargetString) {
+    if (targetString != null) {
+      targetString = targetString.replace(File.separatorChar, '/');
+    }
+    if (baseTargetString != null) {
+      baseTargetString = baseTargetString.replace(File.separatorChar, '/');
+    }
+
+    final String pathAsChild = SVNPathUtil.getPathAsChild(baseTargetString, targetString);
+    if (pathAsChild != null) {
+      return pathAsChild;
+    }
+    if (targetString.equals(baseTargetString)) {
+      return "";
+    }
+    return null;
+  }
+
+  private String getChildPath(String path, String relativeToPath) {
+    if (relativeToTarget == null) {
+      return null;
+    }
+
+    String relativePath = getRelativePath(path, relativeToPath);
+    if (relativePath == null) {
+      return path;
+    }
+
+    if (relativePath.length() > 0) {
+      return relativePath;
+    }
+
+    if (relativeToPath.equals(path)) {
+      return ".";
+    }
+
+    return null;
+  }
+
+  public SCMSvnDiffGenerator() {
+    this.originalTarget1 = null;
+    this.originalTarget2 = null;
+    this.visitedPaths = new HashSet<String>();
+    this.diffDeleted = true;
+    this.diffAdded = true;
+  }
+
+  public void setBaseTarget(SvnTarget baseTarget) {
+    this.baseTarget = baseTarget;
+  }
+
+  public void setUseGitFormat(boolean useGitFormat) {
+    this.useGitFormat = useGitFormat;
+  }
+
+  public void setOriginalTargets(SvnTarget originalTarget1, SvnTarget originalTarget2) {
+    this.originalTarget1 = originalTarget1;
+    this.originalTarget2 = originalTarget2;
+  }
+
+  public void setRelativeToTarget(SvnTarget relativeToTarget) {
+    this.relativeToTarget = relativeToTarget;
+  }
+
+  public void setAnchors(SvnTarget originalTarget1, SvnTarget originalTarget2) {
+    //anchors are not used
+  }
+
+  public void setRepositoryRoot(SvnTarget repositoryRoot) {
+    this.repositoryRoot = repositoryRoot;
+  }
+
+  public void setForceEmpty(boolean forceEmpty) {
+    this.forceEmpty = forceEmpty;
+  }
+
+  public void setEncoding(String encoding) {
+    this.encoding = encoding;
+  }
+
+  public String getEncoding() {
+    return encoding;
+  }
+
+  public String getGlobalEncoding() {
+    ISVNOptions options = getOptions();
+
+    if (options != null && options instanceof DefaultSVNOptions) {
+      DefaultSVNOptions defaultOptions = (DefaultSVNOptions) options;
+      return defaultOptions.getGlobalCharset();
+    }
+    return null;
+  }
+
+  public void setEOL(byte[] eol) {
+    this.eol = eol;
+  }
+
+  public byte[] getEOL() {
+    return eol;
+  }
+
+  public boolean isForcedBinaryDiff() {
+    return forcedBinaryDiff;
+  }
+
+  public void setForcedBinaryDiff(boolean forcedBinaryDiff) {
+    this.forcedBinaryDiff = forcedBinaryDiff;
+  }
+
+  public boolean isPropertiesOnly() {
+    return propertiesOnly;
+  }
+
+  public void setPropertiesOnly(boolean propertiesOnly) {
+    this.propertiesOnly = propertiesOnly;
+  }
+
+  public boolean isIgnoreProperties() {
+    return ignoreProperties;
+  }
+
+  public void setIgnoreProperties(boolean ignoreProperties) {
+    this.ignoreProperties = ignoreProperties;
+  }
+
+  public void displayDeletedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream) throws SVNException {
+  }
+
+  public void displayAddedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream) throws SVNException {
+  }
+
+  public void displayPropsChanged(SvnTarget target, String revision1, String revision2, boolean dirWasAdded, SVNProperties originalProps, SVNProperties propChanges, OutputStream outputStream) throws SVNException {
+    if (isIgnoreProperties()) {
+      return;
+    }
+    if (dirWasAdded && !isDiffAdded()) {
+      return;
+    }
+    ensureEncodingAndEOLSet();
+    String displayPath = getDisplayPath(target);
+
+    String targetString1 = originalTarget1.getPathOrUrlDecodedString();
+    String targetString2 = originalTarget2.getPathOrUrlDecodedString();
+
+    if (displayPath == null || displayPath.length() == 0) {
+      displayPath = ".";
+    }
+
+    if (useGitFormat) {
+      targetString1 = adjustRelativeToReposRoot(targetString1);
+      targetString2 = adjustRelativeToReposRoot(targetString2);
+    }
+
+    String newTargetString = displayPath;
+    String newTargetString1 = targetString1;
+    String newTargetString2 = targetString2;
+
+    String commonAncestor = SVNPathUtil.getCommonPathAncestor(newTargetString1, newTargetString2);
+    int commonLength = commonAncestor == null ? 0 : commonAncestor.length();
+
+    newTargetString1 = newTargetString1.substring(commonLength);
+    newTargetString2 = newTargetString2.substring(commonLength);
+
+    newTargetString1 = computeLabel(newTargetString, newTargetString1);
+    newTargetString2 = computeLabel(newTargetString, newTargetString2);
+
+    if (relativeToTarget != null) {
+      String relativeToPath = relativeToTarget.getPathOrUrlDecodedString();
+      String absolutePath = target.getPathOrUrlDecodedString();
+
+      String childPath = getChildPath(absolutePath, relativeToPath);
+      if (childPath == null) {
+        throwBadRelativePathException(absolutePath, relativeToPath);
+      }
+      String childPath1 = getChildPath(newTargetString1, relativeToPath);
+      if (childPath1 == null) {
+        throwBadRelativePathException(newTargetString1, relativeToPath);
+      }
+      String childPath2 = getChildPath(newTargetString2, relativeToPath);
+      if (childPath2 == null) {
+        throwBadRelativePathException(newTargetString2, relativeToPath);
+      }
+
+      displayPath = childPath;
+      newTargetString1 = childPath1;
+      newTargetString2 = childPath2;
+    }
+
+    boolean showDiffHeader = !visitedPaths.contains(displayPath);
+    if (showDiffHeader) {
+      String label1 = getLabel(newTargetString1, revision1);
+      String label2 = getLabel(newTargetString2, revision2);
+
+      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, false, fallbackToAbsolutePath, SvnDiffCallback.OperationKind.Modified);
+      visitedPaths.add(displayPath);
+      if (useGitFormat) {
+        displayGitDiffHeader(outputStream, SvnDiffCallback.OperationKind.Modified,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          null);
+      }
+      if (shouldStopDisplaying) {
+        return;
+      }
+
+//            if (useGitFormat) {
+//                String copyFromPath = null;
+//                SvnDiffCallback.OperationKind operationKind = SvnDiffCallback.OperationKind.Modified;
+//                label1 = getGitDiffLabel1(operationKind, targetString1, targetString2, copyFromPath, revision1);
+//                label2 = getGitDiffLabel2(operationKind, targetString1, targetString2, copyFromPath, revision2);
+//                displayGitDiffHeader(outputStream, operationKind,
+//                        getRelativeToRootPath(target, originalTarget1),
+//                        getRelativeToRootPath(target, originalTarget2),
+//                        copyFromPath);
+//            }
+
+      if (useGitFormat) {
+        displayGitHeaderFields(outputStream, target, revision1, revision2, SvnDiffCallback.OperationKind.Modified, null);
+      } else {
+        displayHeaderFields(outputStream, label1, label2);
+      }
+    }
+
+    displayPropertyChangesOn(useGitFormat ? getRelativeToRootPath(target, originalTarget1) : displayPath, outputStream);
+
+    displayPropDiffValues(outputStream, propChanges, originalProps);
+  }
+
+  private void throwBadRelativePathException(String displayPath, String relativeToPath) throws SVNException {
+    SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.BAD_RELATIVE_PATH, "Path ''{0}'' must be an immediate child of the directory ''{0}''",
+      displayPath, relativeToPath);
+    SVNErrorManager.error(errorMessage, SVNLogType.CLIENT);
+  }
+
+  private void displayGitHeaderFields(OutputStream outputStream, SvnTarget target, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+    String path1 = copyFromPath != null ? copyFromPath : getRelativeToRootPath(target, originalTarget1);
+    String path2 = getRelativeToRootPath(target, originalTarget2);
+
+    try {
+      displayString(outputStream, "--- ");
+      displayFirstGitLabelPath(outputStream, path1, revision1, operation);
+      displayEOL(outputStream);
+      displayString(outputStream, "+++ ");
+      displaySecondGitLabelPath(outputStream, path2, revision2, operation);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private String adjustRelativeToReposRoot(String targetString) {
+    if (repositoryRoot != null) {
+      String repositoryRootString = repositoryRoot.getPathOrUrlDecodedString();
+      String relativePath = getRelativePath(targetString, repositoryRootString);
+      return relativePath == null ? "" : relativePath;
+    }
+    return targetString;
+  }
+
+  private String computeLabel(String targetString, String originalTargetString) {
+    if (originalTargetString.length() == 0) {
+      return targetString;
+    } else if (originalTargetString.charAt(0) == '/') {
+      return targetString + "\t(..." + originalTargetString + ")";
+    } else {
+      return targetString + "\t(.../" + originalTargetString + ")";
+    }
+  }
+
+  public void displayContentChanged(SvnTarget target, File leftFile, File rightFile, String revision1, String revision2, String mimeType1, String mimeType2, SvnDiffCallback.OperationKind operation, File copyFromPath, SVNProperties originalProperties, SVNProperties propChanges, OutputStream outputStream) throws SVNException {
+    if (isPropertiesOnly()) {
+      return;
+    }
+    ensureEncodingAndEOLSet();
+    String displayPath = getDisplayPath(target);
+
+    String targetString1 = originalTarget1.getPathOrUrlDecodedString();
+    String targetString2 = originalTarget2.getPathOrUrlDecodedString();
+
+    if (useGitFormat) {
+      targetString1 = adjustRelativeToReposRoot(targetString1);
+      targetString2 = adjustRelativeToReposRoot(targetString2);
+    }
+
+    String newTargetString = displayPath;
+    String newTargetString1 = targetString1;
+    String newTargetString2 = targetString2;
+
+    String commonAncestor = SVNPathUtil.getCommonPathAncestor(newTargetString1, newTargetString2);
+    int commonLength = commonAncestor == null ? 0 : commonAncestor.length();
+
+    newTargetString1 = newTargetString1.substring(commonLength);
+    newTargetString2 = newTargetString2.substring(commonLength);
+
+    newTargetString1 = computeLabel(newTargetString, newTargetString1);
+    newTargetString2 = computeLabel(newTargetString, newTargetString2);
+
+    if (relativeToTarget != null) {
+      String relativeToPath = relativeToTarget.getPathOrUrlDecodedString();
+      String absolutePath = target.getPathOrUrlDecodedString();
+
+      String childPath = getChildPath(absolutePath, relativeToPath);
+      if (childPath == null) {
+        throwBadRelativePathException(absolutePath, relativeToPath);
+      }
+      String childPath1 = getChildPath(newTargetString1, relativeToPath);
+      if (childPath1 == null) {
+        throwBadRelativePathException(newTargetString1, relativeToPath);
+      }
+      String childPath2 = getChildPath(newTargetString2, relativeToPath);
+      if (childPath2 == null) {
+        throwBadRelativePathException(newTargetString2, relativeToPath);
+      }
+
+      displayPath = childPath;
+      newTargetString1 = childPath1;
+      newTargetString2 = childPath2;
+    }
+
+    String label1 = getLabel(newTargetString1, revision1);
+    String label2 = getLabel(newTargetString2, revision2);
+
+    boolean leftIsBinary = false;
+    boolean rightIsBinary = false;
+
+    if (mimeType1 != null) {
+      leftIsBinary = SVNProperty.isBinaryMimeType(mimeType1);
+    }
+    if (mimeType2 != null) {
+      rightIsBinary = SVNProperty.isBinaryMimeType(mimeType2);
+    }
+
+    if (!forcedBinaryDiff && (leftIsBinary || rightIsBinary)) {
+      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
+      if (useGitFormat) {
+        displayGitDiffHeader(outputStream, operation,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          null);
+      }
+      visitedPaths.add(displayPath);
+      if (shouldStopDisplaying) {
+        return;
+      }
+
+
+      displayBinary(mimeType1, mimeType2, outputStream, leftIsBinary, rightIsBinary);
+
+      return;
+    }
+
+    final String diffCommand = getExternalDiffCommand();
+    if (diffCommand != null) {
+      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
+      if (useGitFormat) {
+        displayGitDiffHeader(outputStream, operation,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          null);
+      }
+      visitedPaths.add(displayPath);
+      if (shouldStopDisplaying) {
+        return;
+      }
+
+      runExternalDiffCommand(outputStream, diffCommand, leftFile, rightFile, label1, label2);
+    } else {
+      internalDiff(target, outputStream, displayPath, leftFile, rightFile, label1, label2, operation, copyFromPath == null ? null : copyFromPath.getPath(), revision1, revision2);
+    }
+  }
+
+  private void displayBinary(String mimeType1, String mimeType2, OutputStream outputStream, boolean leftIsBinary, boolean rightIsBinary) throws SVNException {
+    displayCannotDisplayFileMarkedBinary(outputStream);
+
+    if (leftIsBinary && !rightIsBinary) {
+      displayMimeType(outputStream, mimeType1);
+    } else if (!leftIsBinary && rightIsBinary) {
+      displayMimeType(outputStream, mimeType2);
+    } else if (leftIsBinary && rightIsBinary) {
+      if (mimeType1.equals(mimeType2)) {
+        displayMimeType(outputStream, mimeType1);
+      } else {
+        displayMimeTypes(outputStream, mimeType1, mimeType2);
+      }
+    }
+  }
+
+  private void internalDiff(SvnTarget target, OutputStream outputStream, String displayPath, File file1, File file2, String label1, String label2, SvnDiffCallback.OperationKind operation, String copyFromPath, String revision1, String revision2) throws SVNException {
+    String header = getHeaderString(target, displayPath, file2 == null, file1 == null, operation, copyFromPath);
+    if (file2 == null && !isDiffDeleted()) {
+      try {
+        displayString(outputStream, header);
+      } catch (IOException e) {
+        wrapException(e);
+      }
+      visitedPaths.add(displayPath);
+      return;
+    }
+    if (file1 == null && !isDiffAdded()) {
+      try {
+        displayString(outputStream, header);
+      } catch (IOException e) {
+        wrapException(e);
+      }
+      visitedPaths.add(displayPath);
+      return;
+    }
+    String headerFields = getHeaderFieldsString(target, displayPath, label1, label2, revision1, revision2, operation, copyFromPath);
+
+    RandomAccessFile is1 = null;
+    RandomAccessFile is2 = null;
+    try {
+      is1 = file1 == null ? null : SVNFileUtil.openRAFileForReading(file1);
+      is2 = file2 == null ? null : SVNFileUtil.openRAFileForReading(file2);
+
+      QDiffUniGenerator.setup();
+      Map properties = new SVNHashMap();
+
+      properties.put(QDiffGeneratorFactory.IGNORE_EOL_PROPERTY, Boolean.valueOf(getDiffOptions().isIgnoreEOLStyle()));
+      properties.put(QDiffGeneratorFactory.EOL_PROPERTY, new String(getEOL()));
+      if (getDiffOptions().isIgnoreAllWhitespace()) {
+        properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_ALL_SPACE);
+      } else if (getDiffOptions().isIgnoreAmountOfWhitespace()) {
+        properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_SPACE_CHANGE);
+      }
+
+      final String diffHeader;
+      if (forceEmpty || useGitFormat) {
+        displayString(outputStream, header);
+        diffHeader = headerFields;
+
+        visitedPaths.add(displayPath);
+      } else {
+        diffHeader = header + headerFields;
+      }
+      QDiffGenerator generator = new QDiffUniGenerator(properties, diffHeader);
+      EmptyDetectionOutputStream emptyDetectionOutputStream = new EmptyDetectionOutputStream(outputStream);
+      QDiffManager.generateTextDiff(is1, is2, emptyDetectionOutputStream, generator);
+      if (emptyDetectionOutputStream.isSomethingWritten()) {
+        visitedPaths.add(displayPath);
+      }
+      emptyDetectionOutputStream.flush();
+    } catch (IOException e) {
+      SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, e.getMessage());
+      SVNErrorManager.error(err, e, SVNLogType.DEFAULT);
+    } finally {
+      SVNFileUtil.closeFile(is1);
+      SVNFileUtil.closeFile(is2);
+    }
+  }
+
+  private String getHeaderFieldsString(SvnTarget target, String displayPath, String label1, String label2, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+    final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    try {
+      if (useGitFormat) {
+        displayGitHeaderFields(byteArrayOutputStream, target, revision1, revision2, operation, copyFromPath);
+      } else {
+        displayHeaderFields(byteArrayOutputStream, label1, label2);
+      }
+    } catch (SVNException e) {
+      SVNFileUtil.closeFile(byteArrayOutputStream);
+
+      try {
+        byteArrayOutputStream.writeTo(byteArrayOutputStream);
+      } catch (IOException e1) {
+      }
+
+      throw e;
+    }
+
+    try {
+      byteArrayOutputStream.close();
+      return byteArrayOutputStream.toString(HEADER_ENCODING);
+    } catch (IOException e) {
+      return "";
+    }
+  }
+
+  private String getHeaderString(SvnTarget target, String displayPath, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+    final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    try {
+      if (!useGitFormat) {
+        displayHeader(byteArrayOutputStream, displayPath, deleted, added, operation);
+      } else {
+        displayGitDiffHeader(byteArrayOutputStream, operation,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          copyFromPath);
+      }
+    } catch (SVNException e) {
+      SVNFileUtil.closeFile(byteArrayOutputStream);
+
+      try {
+        byteArrayOutputStream.writeTo(byteArrayOutputStream);
+      } catch (IOException e1) {
+      }
+
+      throw e;
+    }
+
+    try {
+      byteArrayOutputStream.close();
+      return byteArrayOutputStream.toString(HEADER_ENCODING);
+    } catch (IOException e) {
+      return "";
+    }
+  }
+
+  private void runExternalDiffCommand(OutputStream outputStream, final String diffCommand, File file1, File file2, String label1, String label2) throws SVNException {
+    final List<String> args = new ArrayList<String>();
+    args.add(diffCommand);
+    if (rawDiffOptions != null) {
+      args.addAll(rawDiffOptions);
+    } else {
+      Collection svnDiffOptionsCollection = getDiffOptions().toOptionsCollection();
+      args.addAll(svnDiffOptionsCollection);
+      args.add("-u");
+    }
+
+    if (label1 != null) {
+      args.add("-L");
+      args.add(label1);
+    }
+
+    if (label2 != null) {
+      args.add("-L");
+      args.add(label2);
+    }
+
+    boolean tmpFile1 = false;
+    boolean tmpFile2 = false;
+    if (file1 == null) {
+      file1 = SVNFileUtil.createTempFile("svn.", ".tmp");
+      tmpFile1 = true;
+    }
+    if (file2 == null) {
+      file2 = SVNFileUtil.createTempFile("svn.", ".tmp");
+      tmpFile2 = true;
+    }
+
+    String file1Path = file1.getAbsolutePath().replace(File.separatorChar, '/');
+    String file2Path = file2.getAbsolutePath().replace(File.separatorChar, '/');
+
+    args.add(file1Path);
+    args.add(file2Path);
+    try {
+      final Writer writer = new OutputStreamWriter(outputStream, getEncoding());
+
+      SVNFileUtil.execCommand(args.toArray(new String[args.size()]), true,
+        new ISVNReturnValueCallback() {
+
+          public void handleReturnValue(int returnValue) throws SVNException {
+            if (returnValue != 0 && returnValue != 1) {
+              SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.EXTERNAL_PROGRAM,
+                "''{0}'' returned {1}", new Object[]{diffCommand, String.valueOf(returnValue)});
+              SVNErrorManager.error(err, SVNLogType.DEFAULT);
+            }
+          }
+
+          public void handleChar(char ch) throws SVNException {
+            try {
+              writer.write(ch);
+            } catch (IOException ioe) {
+              SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, ioe.getMessage());
+              SVNErrorManager.error(err, ioe, SVNLogType.DEFAULT);
+            }
+          }
+
+          public boolean isHandleProgramOutput() {
+            return true;
+          }
+        });
+
+      writer.flush();
+    } catch (IOException ioe) {
+      SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, ioe.getMessage());
+      SVNErrorManager.error(err, ioe, SVNLogType.DEFAULT);
+    } finally {
+      try {
+        if (tmpFile1) {
+          SVNFileUtil.deleteFile(file1);
+        }
+        if (tmpFile2) {
+          SVNFileUtil.deleteFile(file2);
+        }
+      } catch (SVNException e) {
+        // skip
+      }
+    }
+  }
+
+  private String getExternalDiffCommand() {
+    return externalDiffCommand;
+  }
+
+  private void displayMimeType(OutputStream outputStream, String mimeType) throws SVNException {
+    try {
+      displayString(outputStream, SVNProperty.MIME_TYPE);
+      displayString(outputStream, " = ");
+      displayString(outputStream, mimeType);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayMimeTypes(OutputStream outputStream, String mimeType1, String mimeType2) throws SVNException {
+    try {
+      displayString(outputStream, SVNProperty.MIME_TYPE);
+      displayString(outputStream, " = (");
+      displayString(outputStream, mimeType1);
+      displayString(outputStream, ", ");
+      displayString(outputStream, mimeType2);
+      displayString(outputStream, ")");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayCannotDisplayFileMarkedBinary(OutputStream outputStream) throws SVNException {
+    try {
+      displayString(outputStream, "Cannot display: file marked as a binary type.");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void ensureEncodingAndEOLSet() {
+    if (getEOL() == null) {
+      setEOL(SVNProperty.EOL_LF_BYTES);
+    }
+    if (getEncoding() == null) {
+      final ISVNOptions options = getOptions();
+      if (options != null && options.getNativeCharset() != null) {
+        setEncoding(options.getNativeCharset());
+      } else {
+        setEncoding("UTF-8");
+      }
+    }
+  }
+
+  private void displayPropDiffValues(OutputStream outputStream, SVNProperties diff, SVNProperties baseProps) throws SVNException {
+    for (Iterator changedPropNames = diff.nameSet().iterator(); changedPropNames.hasNext(); ) {
+      String name = (String) changedPropNames.next();
+      SVNPropertyValue originalValue = baseProps != null ? baseProps.getSVNPropertyValue(name) : null;
+      SVNPropertyValue newValue = diff.getSVNPropertyValue(name);
+      String headerFormat = null;
+
+      if (originalValue == null) {
+        headerFormat = "Added: ";
+      } else if (newValue == null) {
+        headerFormat = "Deleted: ";
+      } else {
+        headerFormat = "Modified: ";
+      }
+
+      try {
+        displayString(outputStream, (headerFormat + name));
+        displayEOL(outputStream);
+        if (SVNProperty.MERGE_INFO.equals(name)) {
+          displayMergeInfoDiff(outputStream, originalValue == null ? null : originalValue.getString(), newValue == null ? null : newValue.getString());
+          continue;
+        }
+
+        byte[] originalValueBytes = getPropertyAsBytes(originalValue, getEncoding());
+        byte[] newValueBytes = getPropertyAsBytes(newValue, getEncoding());
+
+        if (originalValueBytes == null) {
+          originalValueBytes = new byte[0];
+        } else {
+          originalValueBytes = maybeAppendEOL(originalValueBytes);
+        }
+
+        boolean newValueHadEol = newValueBytes != null && newValueBytes.length > 0 &&
+          (newValueBytes[newValueBytes.length - 1] == SVNProperty.EOL_CR_BYTES[0] ||
+            newValueBytes[newValueBytes.length - 1] == SVNProperty.EOL_LF_BYTES[0]);
+
+        if (newValueBytes == null) {
+          newValueBytes = new byte[0];
+        } else {
+          newValueBytes = maybeAppendEOL(newValueBytes);
+        }
+
+        QDiffUniGenerator.setup();
+        Map properties = new SVNHashMap();
+
+        properties.put(QDiffGeneratorFactory.IGNORE_EOL_PROPERTY, Boolean.valueOf(getDiffOptions().isIgnoreEOLStyle()));
+        properties.put(QDiffGeneratorFactory.EOL_PROPERTY, new String(getEOL()));
+        properties.put(QDiffGeneratorFactory.HUNK_DELIMITER, "##");
+        if (getDiffOptions().isIgnoreAllWhitespace()) {
+          properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_ALL_SPACE);
+        } else if (getDiffOptions().isIgnoreAmountOfWhitespace()) {
+          properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_SPACE_CHANGE);
+        }
+
+        QDiffGenerator generator = new QDiffUniGenerator(properties, "");
+        Writer writer = new OutputStreamWriter(outputStream, getEncoding());
+        QDiffManager.generateTextDiff(new ByteArrayInputStream(originalValueBytes), new ByteArrayInputStream(newValueBytes),
+          null, writer, generator);
+        writer.flush();
+        if (!newValueHadEol) {
+          displayString(outputStream, "\\ No newline at end of property");
+          displayEOL(outputStream);
+        }
+      } catch (IOException e) {
+        wrapException(e);
+      }
+    }
+
+  }
+
+  private byte[] maybeAppendEOL(byte[] buffer) {
+    if (buffer.length == 0) {
+      return buffer;
+    }
+
+    byte lastByte = buffer[buffer.length - 1];
+    if (lastByte == SVNProperty.EOL_CR_BYTES[0]) {
+      return buffer;
+    } else if (lastByte != SVNProperty.EOL_LF_BYTES[0]) {
+      final byte[] newBuffer = new byte[buffer.length + getEOL().length];
+      System.arraycopy(buffer, 0, newBuffer, 0, buffer.length);
+      System.arraycopy(getEOL(), 0, newBuffer, buffer.length, getEOL().length);
+      return newBuffer;
+    } else {
+      return buffer;
+    }
+  }
+
+  private String getGitDiffLabel1(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision) {
+    if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+      return getLabel("a/" + path1, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+      return getLabel("a/" + copyFromPath, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+      return getLabel("/dev/null", revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+      return getLabel("a/" + path1, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+      return getLabel("a/" + copyFromPath, revision);
+    }
+    throw new IllegalArgumentException("Unsupported operation: " + operationKind);
+  }
+
+  private String getGitDiffLabel2(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision) {
+    if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+      return getLabel("/dev/null", revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+      return getLabel("b/" + path2, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+      return getLabel("b/" + path2, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+      return getLabel("b/" + path2, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+      return getLabel("b/" + path2, revision);
+    }
+    throw new IllegalArgumentException("Unsupported operation: " + operationKind);
+  }
+
+  private void displayGitDiffHeader(OutputStream outputStream, SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath) throws SVNException {
+    if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+      displayGitDiffHeaderDeleted(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+      displayGitDiffHeaderCopied(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+      displayGitDiffHeaderAdded(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+      displayGitDiffHeaderModified(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+      displayGitDiffHeaderRenamed(outputStream, path1, path2, copyFromPath);
+    }
+  }
+
+  private void displayGitDiffHeaderAdded(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, path1);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "new file mode 100644");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayGitDiffHeaderDeleted(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, path1);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "deleted file mode 100644");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayGitDiffHeaderCopied(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, copyFromPath);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "copy from ");
+      displayString(outputStream, copyFromPath);
+      displayEOL(outputStream);
+      displayString(outputStream, "copy to ");
+      displayString(outputStream, path2);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayGitDiffHeaderRenamed(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, copyFromPath);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "rename from ");
+      displayString(outputStream, copyFromPath);
+      displayEOL(outputStream);
+      displayString(outputStream, "rename to ");
+      displayString(outputStream, path2);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayGitDiffHeaderModified(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, path1);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayFirstGitPath(OutputStream outputStream, String path1) throws IOException {
+    displayGitPath(outputStream, path1, "a/", false);
+  }
+
+  private void displaySecondGitPath(OutputStream outputStream, String path2) throws IOException {
+    displayGitPath(outputStream, path2, "b/", false);
+  }
+
+  private void displayFirstGitLabelPath(OutputStream outputStream, String path1, String revision1, SvnDiffCallback.OperationKind operation) throws IOException {
+    String pathPrefix = "a/";
+    if (operation == SvnDiffCallback.OperationKind.Added) {
+      path1 = "/dev/null";
+      pathPrefix = "";
+    }
+    displayGitPath(outputStream, getLabel(path1, revision1), pathPrefix, true);
+  }
+
+  private void displaySecondGitLabelPath(OutputStream outputStream, String path2, String revision2, SvnDiffCallback.OperationKind operation) throws IOException {
+    String pathPrefix = "b/";
+    if (operation == SvnDiffCallback.OperationKind.Deleted) {
+      path2 = "/dev/null";
+      pathPrefix = "";
+    }
+    displayGitPath(outputStream, getLabel(path2, revision2), pathPrefix, true);
+  }
+
+  private void displayGitPath(OutputStream outputStream, String path1, String pathPrefix, boolean label) throws IOException {
+//        if (!label && path1.length() == 0) {
+//            displayString(outputStream, ".");
+//        } else {
+    displayString(outputStream, pathPrefix);
+    displayString(outputStream, path1);
+//        }
+  }
+
+  private String getAdjustedPathWithLabel(String displayPath, String path, String revision, String commonAncestor) {
+    String adjustedPath = getAdjustedPath(displayPath, path, commonAncestor);
+    return getLabel(adjustedPath, revision);
+  }
+
+  private String getAdjustedPath(String displayPath, String path1, String commonAncestor) {
+    String adjustedPath = getRelativePath(path1, commonAncestor);
+
+    if (adjustedPath == null || adjustedPath.length() == 0) {
+      adjustedPath = displayPath;
+    } else if (adjustedPath.charAt(0) == '/') {
+      adjustedPath = displayPath + "\t(..." + adjustedPath + ")";
+    } else {
+      adjustedPath = displayPath + "\t(.../" + adjustedPath + ")";
+    }
+    return adjustedPath;
+    //TODO: respect relativeToDir
+  }
+
+  protected String getLabel(String path, String revToken) {
+    if (useGitFormat){
+      return path;
+    }
+    revToken = revToken == null ? WC_REVISION_LABEL : revToken;
+    return path + "\t" + revToken;
+  }
+
+  protected boolean displayHeader(OutputStream os, String path, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation) throws SVNException {
+    try {
+      if (deleted && !isDiffDeleted()) {
+        displayString(os, "Index: ");
+        displayString(os, path);
+        displayString(os, " (deleted)");
+        displayEOL(os);
+        displayString(os, HEADER_SEPARATOR);
+        displayEOL(os);
+        return true;
+      }
+      if (added && !isDiffAdded()) {
+        displayString(os, "Index: ");
+        displayString(os, path);
+        displayString(os, " (added)");
+        displayEOL(os);
+        displayString(os, HEADER_SEPARATOR);
+        displayEOL(os);
+        return true;
+      }
+      displayString(os, "Index: ");
+      displayString(os, path);
+      displayEOL(os);
+      displayString(os, HEADER_SEPARATOR);
+      displayEOL(os);
+      return false;
+    } catch (IOException e) {
+      wrapException(e);
+    }
+    return false;
+  }
+
+  protected void displayHeaderFields(OutputStream os, String label1, String label2) throws SVNException {
+    try {
+      displayString(os, "--- ");
+      displayString(os, label1);
+      displayEOL(os);
+      displayString(os, "+++ ");
+      displayString(os, label2);
+      displayEOL(os);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayPropertyChangesOn(String path, OutputStream outputStream) throws SVNException {
+    try {
+      displayEOL(outputStream);
+      displayString(outputStream, ("Property changes on: " + (useLocalFileSeparatorChar() ? path.replace('/', File.separatorChar) : path)));
+      displayEOL(outputStream);
+      displayString(outputStream, PROPERTIES_SEPARATOR);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private byte[] getPropertyAsBytes(SVNPropertyValue value, String encoding) {
+    if (value == null) {
+      return null;
+    }
+    if (value.isString()) {
+      try {
+        return value.getString().getBytes(encoding);
+      } catch (UnsupportedEncodingException e) {
+        return value.getString().getBytes();
+      }
+    }
+    return value.getBytes();
+  }
+
+  private void displayMergeInfoDiff(OutputStream outputStream, String oldValue, String newValue) throws SVNException, IOException {
+    Map oldMergeInfo = null;
+    Map newMergeInfo = null;
+    if (oldValue != null) {
+      oldMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(oldValue), null);
+    }
+    if (newValue != null) {
+      newMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(newValue), null);
+    }
+
+    Map deleted = new TreeMap();
+    Map added = new TreeMap();
+    SVNMergeInfoUtil.diffMergeInfo(deleted, added, oldMergeInfo, newMergeInfo, true);
+
+    for (Iterator paths = deleted.keySet().iterator(); paths.hasNext(); ) {
+      String path = (String) paths.next();
+      SVNMergeRangeList rangeList = (SVNMergeRangeList) deleted.get(path);
+      displayString(outputStream, ("   Reverse-merged " + path + ":r"));
+      displayString(outputStream, rangeList.toString());
+      displayEOL(outputStream);
+    }
+
+    for (Iterator paths = added.keySet().iterator(); paths.hasNext(); ) {
+      String path = (String) paths.next();
+      SVNMergeRangeList rangeList = (SVNMergeRangeList) added.get(path);
+      displayString(outputStream, ("   Merged " + path + ":r"));
+      displayString(outputStream, rangeList.toString());
+      displayEOL(outputStream);
+    }
+  }
+
+  private boolean useLocalFileSeparatorChar() {
+    return true;
+  }
+
+  public boolean isDiffDeleted() {
+    return diffDeleted;
+  }
+
+  public boolean isDiffAdded() {
+    return diffAdded;
+  }
+
+  private void wrapException(IOException e) throws SVNException {
+    SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, e);
+    SVNErrorManager.error(errorMessage, e, SVNLogType.WC);
+  }
+
+  private void displayString(OutputStream outputStream, String s) throws IOException {
+    outputStream.write(s.getBytes(HEADER_ENCODING));
+  }
+
+  private void displayEOL(OutputStream os) throws IOException {
+    os.write(getEOL());
+  }
+
+  public SVNDiffOptions getDiffOptions() {
+    if (diffOptions == null) {
+      diffOptions = new SVNDiffOptions();
+    }
+    return diffOptions;
+  }
+
+  public void setExternalDiffCommand(String externalDiffCommand) {
+    this.externalDiffCommand = externalDiffCommand;
+  }
+
+  public void setRawDiffOptions(List<String> rawDiffOptions) {
+    this.rawDiffOptions = rawDiffOptions;
+  }
+
+  public void setDiffOptions(SVNDiffOptions diffOptions) {
+    this.diffOptions = diffOptions;
+  }
+
+  public void setDiffDeleted(boolean diffDeleted) {
+    this.diffDeleted = diffDeleted;
+  }
+
+  public void setDiffAdded(boolean diffAdded) {
+    this.diffAdded = diffAdded;
+  }
+
+  public void setBasePath(File absoluteFile) {
+    setBaseTarget(SvnTarget.fromFile(absoluteFile));
+  }
+
+  public void setFallbackToAbsolutePath(boolean fallbackToAbsolutePath) {
+    this.fallbackToAbsolutePath = fallbackToAbsolutePath;
+  }
+
+  public void setOptions(ISVNOptions options) {
+    this.options = options;
+  }
+
+  public ISVNOptions getOptions() {
+    return options;
+  }
+
+  private class EmptyDetectionOutputStream extends OutputStream {
+
+    private final OutputStream outputStream;
+    private boolean somethingWritten;
+
+    public EmptyDetectionOutputStream(OutputStream outputStream) {
+      this.outputStream = outputStream;
+      this.somethingWritten = false;
+    }
+
+    public boolean isSomethingWritten() {
+      return somethingWritten;
+    }
+
+    @Override
+    public void write(int c) throws IOException {
+      somethingWritten = true;
+      outputStream.write(c);
+    }
+
+    @Override
+    public void write(byte[] bytes) throws IOException {
+      somethingWritten = bytes.length > 0;
+      outputStream.write(bytes);
+    }
+
+    @Override
+    public void write(byte[] bytes, int offset, int length) throws IOException {
+      somethingWritten = length > 0;
+      outputStream.write(bytes, offset, length);
+    }
+
+    @Override
+    public void flush() throws IOException {
+      outputStream.flush();
+    }
+
+    @Override
+    public void close() throws IOException {
+      outputStream.close();
+    }
+  }
+}
diff --git a/scm-it/src/test/resources/diff/largefile/original/SvnDiffGenerator_forTest.java b/scm-it/src/test/resources/diff/largefile/original/SvnDiffGenerator_forTest.java
new file mode 100644
index 0000000000..d0cf749024
--- /dev/null
+++ b/scm-it/src/test/resources/diff/largefile/original/SvnDiffGenerator_forTest.java
@@ -0,0 +1,1240 @@
+package sonia.scm.repository.spi;
+
+import de.regnis.q.sequence.line.diff.QDiffGenerator;
+import de.regnis.q.sequence.line.diff.QDiffGeneratorFactory;
+import de.regnis.q.sequence.line.diff.QDiffManager;
+import de.regnis.q.sequence.line.diff.QDiffUniGenerator;
+import org.tmatesoft.svn.core.SVNErrorCode;
+import org.tmatesoft.svn.core.SVNErrorMessage;
+import org.tmatesoft.svn.core.SVNException;
+import org.tmatesoft.svn.core.SVNMergeRangeList;
+import org.tmatesoft.svn.core.SVNProperties;
+import org.tmatesoft.svn.core.SVNProperty;
+import org.tmatesoft.svn.core.SVNPropertyValue;
+import org.tmatesoft.svn.core.internal.util.SVNHashMap;
+import org.tmatesoft.svn.core.internal.util.SVNMergeInfoUtil;
+import org.tmatesoft.svn.core.internal.util.SVNPathUtil;
+import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions;
+import org.tmatesoft.svn.core.internal.wc.ISVNReturnValueCallback;
+import org.tmatesoft.svn.core.internal.wc.SVNErrorManager;
+import org.tmatesoft.svn.core.internal.wc.SVNFileUtil;
+import org.tmatesoft.svn.core.internal.wc2.ng.ISvnDiffGenerator;
+import org.tmatesoft.svn.core.internal.wc2.ng.SvnDiffCallback;
+import org.tmatesoft.svn.core.wc.ISVNOptions;
+import org.tmatesoft.svn.core.wc.SVNDiffOptions;
+import org.tmatesoft.svn.core.wc2.SvnTarget;
+import org.tmatesoft.svn.util.SVNLogType;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
+
+  protected static final String WC_REVISION_LABEL = "(working copy)";
+  protected static final String PROPERTIES_SEPARATOR = "___________________________________________________________________";
+  protected static final String HEADER_SEPARATOR = "===================================================================";
+  protected static final String HEADER_ENCODING = "UTF-8";
+
+  private SvnTarget originalTarget1;
+  private SvnTarget originalTarget2;
+  private SvnTarget baseTarget;
+  private SvnTarget relativeToTarget;
+  private SvnTarget repositoryRoot;
+  private String encoding;
+  private byte[] eol;
+  private boolean useGitFormat;
+  private boolean forcedBinaryDiff;
+
+  private boolean diffDeleted;
+  private boolean diffAdded;
+  private List<String> rawDiffOptions;
+  private boolean forceEmpty;
+
+  private Set<String> visitedPaths;
+  private String externalDiffCommand;
+  private SVNDiffOptions diffOptions;
+  private boolean fallbackToAbsolutePath;
+  private ISVNOptions options;
+  private boolean propertiesOnly;
+  private boolean ignoreProperties;
+
+  private String getDisplayPath(SvnTarget target) {
+    String relativePath;
+    if (baseTarget == null) {
+      relativePath = null;
+    } else {
+      String targetString = target.getPathOrUrlDecodedString();
+      String baseTargetString = baseTarget.getPathOrUrlDecodedString();
+      relativePath = getRelativePath(targetString, baseTargetString);
+    }
+
+    return relativePath != null ? relativePath : target.getPathOrUrlString();
+  }
+
+  private String getRelativeToRootPath(SvnTarget target, SvnTarget originalTarget) {
+    String relativePath;
+    if (repositoryRoot == null)
+    {
+      relativePath = null;
+    }
+    else
+      {
+      if (repositoryRoot.isFile() == target.isFile())
+      {
+        String targetString = target.getPathOrUrlDecodedString();
+        String baseTargetString = repositoryRoot.getPathOrUrlDecodedString();
+        relativePath = getRelativePath(targetString, baseTargetString);
+      }
+      else
+        {
+        String targetString = target.getPathOrUrlDecodedString();
+        String baseTargetString = new File("").getAbsolutePath();
+        relativePath = getRelativePath(targetString, baseTargetString);
+      }
+    }
+
+    return relativePath != null ? relativePath : target.getPathOrUrlString();
+  }
+
+  private String getRelativePath(String targetString, String baseTargetString) {
+    if (targetString != null)
+    {
+      targetString = targetString.replace(File.separatorChar, '/');
+    }
+    if (baseTargetString != null)
+    {
+      baseTargetString = baseTargetString.replace(File.separatorChar, '/');
+    }
+
+    final String pathAsChild = SVNPathUtil.getPathAsChild(baseTargetString, targetString);
+    if (pathAsChild != null)
+    {
+      return pathAsChild;
+    }
+    if (targetString.equals(baseTargetString))
+    {
+      return "";
+    }
+    return null;
+  }
+
+  private String getChildPath(String path, String relativeToPath) {
+    if (relativeToTarget == null) {
+      return null;
+    }
+
+    String relativePath = getRelativePath(path, relativeToPath);
+    if (relativePath == null) {
+      return path;
+    }
+
+    if (relativePath.length() > 0) {
+      return relativePath;
+    }
+
+    if (relativeToPath.equals(path)) {
+      return ".";
+    }
+
+    return null;
+  }
+
+  public SCMSvnDiffGenerator() {
+    this.originalTarget1 = null;
+    this.originalTarget2 = null;
+    this.visitedPaths = new HashSet<String>();
+    this.diffDeleted = true;
+    this.diffAdded = true;
+  }
+
+  public void setBaseTarget(SvnTarget baseTarget) {
+    this.baseTarget = baseTarget;
+  }
+
+  public void setUseGitFormat(boolean useGitFormat) {
+    this.useGitFormat = useGitFormat;
+  }
+
+  public void setOriginalTargets(SvnTarget originalTarget1, SvnTarget originalTarget2) {
+    this.originalTarget1 = originalTarget1;
+    this.originalTarget2 = originalTarget2;
+  }
+
+  public void setRelativeToTarget(SvnTarget relativeToTarget) {
+    this.relativeToTarget = relativeToTarget;
+  }
+
+  public void setAnchors(SvnTarget originalTarget1, SvnTarget originalTarget2) {
+    //anchors are not used
+  }
+
+  public void setRepositoryRoot(SvnTarget repositoryRoot) {
+    this.repositoryRoot = repositoryRoot;
+  }
+
+  public void setForceEmpty(boolean forceEmpty) {
+    this.forceEmpty = forceEmpty;
+  }
+
+  public void setEncoding(String encoding) {
+    this.encoding = encoding;
+  }
+
+  public String getEncoding() {
+    return encoding;
+  }
+
+  public String getGlobalEncoding() {
+    ISVNOptions options = getOptions();
+
+    if (options != null && options instanceof DefaultSVNOptions) {
+      DefaultSVNOptions defaultOptions = (DefaultSVNOptions) options;
+      return defaultOptions.getGlobalCharset();
+    }
+    return null;
+  }
+
+  public void setEOL(byte[] eol) {
+    this.eol = eol;
+  }
+
+  public byte[] getEOL() {
+    return eol;
+  }
+
+  public boolean isForcedBinaryDiff() {
+    return forcedBinaryDiff;
+  }
+
+  public void setForcedBinaryDiff(boolean forcedBinaryDiff) {
+    this.forcedBinaryDiff = forcedBinaryDiff;
+  }
+
+  public boolean isPropertiesOnly() {
+    return propertiesOnly;
+  }
+
+  public void setPropertiesOnly(boolean propertiesOnly) {
+    this.propertiesOnly = propertiesOnly;
+  }
+
+  public boolean isIgnoreProperties() {
+    return ignoreProperties;
+  }
+
+  public void setIgnoreProperties(boolean ignoreProperties) {
+    this.ignoreProperties = ignoreProperties;
+  }
+
+  public void displayDeletedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream) throws SVNException {
+  }
+
+  public void displayAddedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream) throws SVNException {
+  }
+
+  public void displayPropsChanged(SvnTarget target, String revision1, String revision2, boolean dirWasAdded, SVNProperties originalProps, SVNProperties propChanges, OutputStream outputStream) throws SVNException {
+    if (isIgnoreProperties()) {
+      return;
+    }
+    if (dirWasAdded && !isDiffAdded()) {
+      return;
+    }
+    ensureEncodingAndEOLSet();
+    String displayPath = getDisplayPath(target);
+
+    String targetString1 = originalTarget1.getPathOrUrlDecodedString();
+    String targetString2 = originalTarget2.getPathOrUrlDecodedString();
+
+    if (displayPath == null || displayPath.length() == 0) {
+      displayPath = ".";
+    }
+
+    if (useGitFormat) {
+      targetString1 = adjustRelativeToReposRoot(targetString1);
+      targetString2 = adjustRelativeToReposRoot(targetString2);
+    }
+
+    String newTargetString = displayPath;
+    String newTargetString1 = targetString1;
+    String newTargetString2 = targetString2;
+
+    String commonAncestor = SVNPathUtil.getCommonPathAncestor(newTargetString1, newTargetString2);
+    int commonLength = commonAncestor == null ? 0 : commonAncestor.length();
+
+    newTargetString1 = newTargetString1.substring(commonLength);
+    newTargetString2 = newTargetString2.substring(commonLength);
+
+    newTargetString1 = computeLabel(newTargetString, newTargetString1);
+    newTargetString2 = computeLabel(newTargetString, newTargetString2);
+
+    if (relativeToTarget != null) {
+      String relativeToPath = relativeToTarget.getPathOrUrlDecodedString();
+      String absolutePath = target.getPathOrUrlDecodedString();
+
+      String childPath = getChildPath(absolutePath, relativeToPath);
+      if (childPath == null) {
+        throwBadRelativePathException(absolutePath, relativeToPath);
+      }
+      String childPath1 = getChildPath(newTargetString1, relativeToPath);
+      if (childPath1 == null) {
+        throwBadRelativePathException(newTargetString1, relativeToPath);
+      }
+      String childPath2 = getChildPath(newTargetString2, relativeToPath);
+      if (childPath2 == null) {
+        throwBadRelativePathException(newTargetString2, relativeToPath);
+      }
+
+      displayPath = childPath;
+      newTargetString1 = childPath1;
+      newTargetString2 = childPath2;
+    }
+
+    boolean showDiffHeader = !visitedPaths.contains(displayPath);
+    if (showDiffHeader) {
+      String label1 = getLabel(newTargetString1, revision1);
+      String label2 = getLabel(newTargetString2, revision2);
+
+      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, false, fallbackToAbsolutePath, SvnDiffCallback.OperationKind.Modified);
+      visitedPaths.add(displayPath);
+      if (useGitFormat) {
+        displayGitDiffHeader(outputStream, SvnDiffCallback.OperationKind.Modified,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          null);
+      }
+      if (shouldStopDisplaying) {
+        return;
+      }
+
+//            if (useGitFormat) {
+//                String copyFromPath = null;
+//                SvnDiffCallback.OperationKind operationKind = SvnDiffCallback.OperationKind.Modified;
+//                label1 = getGitDiffLabel1(operationKind, targetString1, targetString2, copyFromPath, revision1);
+//                label2 = getGitDiffLabel2(operationKind, targetString1, targetString2, copyFromPath, revision2);
+//                displayGitDiffHeader(outputStream, operationKind,
+//                        getRelativeToRootPath(target, originalTarget1),
+//                        getRelativeToRootPath(target, originalTarget2),
+//                        copyFromPath);
+//            }
+
+      if (useGitFormat) {
+        displayGitHeaderFields(outputStream, target, revision1, revision2, SvnDiffCallback.OperationKind.Modified, null);
+      } else {
+        displayHeaderFields(outputStream, label1, label2);
+      }
+    }
+
+    displayPropertyChangesOn(useGitFormat ? getRelativeToRootPath(target, originalTarget1) : displayPath, outputStream);
+
+    displayPropDiffValues(outputStream, propChanges, originalProps);
+  }
+
+  private void throwBadRelativePathException(String displayPath, String relativeToPath) throws SVNException {
+    SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.BAD_RELATIVE_PATH, "Path ''{0}'' must be an immediate child of the directory ''{0}''",
+      displayPath, relativeToPath);
+    SVNErrorManager.error(errorMessage, SVNLogType.CLIENT);
+  }
+
+  private void displayGitHeaderFields(OutputStream outputStream, SvnTarget target, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+    String path1 = copyFromPath != null ? copyFromPath : getRelativeToRootPath(target, originalTarget1);
+    String path2 = getRelativeToRootPath(target, originalTarget2);
+
+    try {
+      displayString(outputStream, "--- ");
+      displayFirstGitLabelPath(outputStream, path1, revision1, operation);
+      displayEOL(outputStream);
+      displayString(outputStream, "+++ ");
+      displaySecondGitLabelPath(outputStream, path2, revision2, operation);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private String adjustRelativeToReposRoot(String targetString) {
+    if (repositoryRoot != null) {
+      String repositoryRootString = repositoryRoot.getPathOrUrlDecodedString();
+      String relativePath = getRelativePath(targetString, repositoryRootString);
+      return relativePath == null ? "" : relativePath;
+    }
+    return targetString;
+  }
+
+  private String computeLabel(String targetString, String originalTargetString) {
+    if (originalTargetString.length() == 0) {
+      return targetString;
+    } else if (originalTargetString.charAt(0) == '/') {
+      return targetString + "\t(..." + originalTargetString + ")";
+    } else {
+      return targetString + "\t(.../" + originalTargetString + ")";
+    }
+  }
+
+  public void displayContentChanged(SvnTarget target, File leftFile, File rightFile, String revision1, String revision2, String mimeType1, String mimeType2, SvnDiffCallback.OperationKind operation, File copyFromPath, SVNProperties originalProperties, SVNProperties propChanges, OutputStream outputStream) throws SVNException {
+    if (isPropertiesOnly()) {
+      return;
+    }
+    ensureEncodingAndEOLSet();
+    String displayPath = getDisplayPath(target);
+
+    String targetString1 = originalTarget1.getPathOrUrlDecodedString();
+    String targetString2 = originalTarget2.getPathOrUrlDecodedString();
+
+    if (useGitFormat) {
+      targetString1 = adjustRelativeToReposRoot(targetString1);
+      targetString2 = adjustRelativeToReposRoot(targetString2);
+    }
+
+    String newTargetString = displayPath;
+    String newTargetString1 = targetString1;
+    String newTargetString2 = targetString2;
+
+    String commonAncestor = SVNPathUtil.getCommonPathAncestor(newTargetString1, newTargetString2);
+    int commonLength = commonAncestor == null ? 0 : commonAncestor.length();
+
+    newTargetString1 = newTargetString1.substring(commonLength);
+    newTargetString2 = newTargetString2.substring(commonLength);
+
+    newTargetString1 = computeLabel(newTargetString, newTargetString1);
+    newTargetString2 = computeLabel(newTargetString, newTargetString2);
+
+    if (relativeToTarget != null) {
+      String relativeToPath = relativeToTarget.getPathOrUrlDecodedString();
+      String absolutePath = target.getPathOrUrlDecodedString();
+
+      String childPath = getChildPath(absolutePath, relativeToPath);
+      if (childPath == null) {
+        throwBadRelativePathException(absolutePath, relativeToPath);
+      }
+      String childPath1 = getChildPath(newTargetString1, relativeToPath);
+      if (childPath1 == null) {
+        throwBadRelativePathException(newTargetString1, relativeToPath);
+      }
+      String childPath2 = getChildPath(newTargetString2, relativeToPath);
+      if (childPath2 == null) {
+        throwBadRelativePathException(newTargetString2, relativeToPath);
+      }
+
+      displayPath = childPath;
+      newTargetString1 = childPath1;
+      newTargetString2 = childPath2;
+    }
+
+    String label1 = getLabel(newTargetString1, revision1);
+    String label2 = getLabel(newTargetString2, revision2);
+
+    boolean leftIsBinary = false;
+    boolean rightIsBinary = false;
+
+    if (mimeType1 != null) {
+      leftIsBinary = SVNProperty.isBinaryMimeType(mimeType1);
+    }
+    if (mimeType2 != null) {
+      rightIsBinary = SVNProperty.isBinaryMimeType(mimeType2);
+    }
+
+    if (!forcedBinaryDiff && (leftIsBinary || rightIsBinary)) {
+      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
+      if (useGitFormat) {
+        displayGitDiffHeader(outputStream, operation,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          null);
+      }
+      visitedPaths.add(displayPath);
+      if (shouldStopDisplaying) {
+        return;
+      }
+
+
+      displayBinary(mimeType1, mimeType2, outputStream, leftIsBinary, rightIsBinary);
+
+      return;
+    }
+
+    final String diffCommand = getExternalDiffCommand();
+    if (diffCommand != null) {
+      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
+      if (useGitFormat) {
+        displayGitDiffHeader(outputStream, operation,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          null);
+      }
+      visitedPaths.add(displayPath);
+      if (shouldStopDisplaying) {
+        return;
+      }
+
+      runExternalDiffCommand(outputStream, diffCommand, leftFile, rightFile, label1, label2);
+    } else {
+      internalDiff(target, outputStream, displayPath, leftFile, rightFile, label1, label2, operation, copyFromPath == null ? null : copyFromPath.getPath(), revision1, revision2);
+    }
+  }
+
+  private void displayBinary(String mimeType1, String mimeType2, OutputStream outputStream, boolean leftIsBinary, boolean rightIsBinary) throws SVNException {
+    displayCannotDisplayFileMarkedBinary(outputStream);
+
+    if (leftIsBinary && !rightIsBinary) {
+      displayMimeType(outputStream, mimeType1);
+    } else if (!leftIsBinary && rightIsBinary) {
+      displayMimeType(outputStream, mimeType2);
+    } else if (leftIsBinary && rightIsBinary) {
+      if (mimeType1.equals(mimeType2)) {
+        displayMimeType(outputStream, mimeType1);
+      } else {
+        displayMimeTypes(outputStream, mimeType1, mimeType2);
+      }
+    }
+  }
+
+  private void internalDiff(SvnTarget target, OutputStream outputStream, String displayPath, File file1, File file2, String label1, String label2, SvnDiffCallback.OperationKind operation, String copyFromPath, String revision1, String revision2) throws SVNException {
+    String header = getHeaderString(target, displayPath, file2 == null, file1 == null, operation, copyFromPath);
+    if (file2 == null && !isDiffDeleted()) {
+      try {
+        displayString(outputStream, header);
+      } catch (IOException e) {
+        wrapException(e);
+      }
+      visitedPaths.add(displayPath);
+      return;
+    }
+    if (file1 == null && !isDiffAdded()) {
+      try {
+        displayString(outputStream, header);
+      } catch (IOException e) {
+        wrapException(e);
+      }
+      visitedPaths.add(displayPath);
+      return;
+    }
+    String headerFields = getHeaderFieldsString(target, displayPath, label1, label2, revision1, revision2, operation, copyFromPath);
+
+    RandomAccessFile is1 = null;
+    RandomAccessFile is2 = null;
+    try {
+      is1 = file1 == null ? null : SVNFileUtil.openRAFileForReading(file1);
+      is2 = file2 == null ? null : SVNFileUtil.openRAFileForReading(file2);
+
+      QDiffUniGenerator.setup();
+      Map properties = new SVNHashMap();
+
+      properties.put(QDiffGeneratorFactory.IGNORE_EOL_PROPERTY, Boolean.valueOf(getDiffOptions().isIgnoreEOLStyle()));
+      properties.put(QDiffGeneratorFactory.EOL_PROPERTY, new String(getEOL()));
+      if (getDiffOptions().isIgnoreAllWhitespace()) {
+        properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_ALL_SPACE);
+      } else if (getDiffOptions().isIgnoreAmountOfWhitespace()) {
+        properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_SPACE_CHANGE);
+      }
+
+      final String diffHeader;
+      if (forceEmpty || useGitFormat) {
+        displayString(outputStream, header);
+        diffHeader = headerFields;
+
+        visitedPaths.add(displayPath);
+      } else {
+        diffHeader = header + headerFields;
+      }
+      QDiffGenerator generator = new QDiffUniGenerator(properties, diffHeader);
+      EmptyDetectionOutputStream emptyDetectionOutputStream = new EmptyDetectionOutputStream(outputStream);
+      QDiffManager.generateTextDiff(is1, is2, emptyDetectionOutputStream, generator);
+      if (emptyDetectionOutputStream.isSomethingWritten()) {
+        visitedPaths.add(displayPath);
+      }
+      emptyDetectionOutputStream.flush();
+    } catch (IOException e) {
+      SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, e.getMessage());
+      SVNErrorManager.error(err, e, SVNLogType.DEFAULT);
+    } finally {
+      SVNFileUtil.closeFile(is1);
+      SVNFileUtil.closeFile(is2);
+    }
+  }
+
+  private String getHeaderFieldsString(SvnTarget target, String displayPath, String label1, String label2, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+    final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    try {
+      if (useGitFormat) {
+        displayGitHeaderFields(byteArrayOutputStream, target, revision1, revision2, operation, copyFromPath);
+      } else {
+        displayHeaderFields(byteArrayOutputStream, label1, label2);
+      }
+    } catch (SVNException e) {
+      SVNFileUtil.closeFile(byteArrayOutputStream);
+
+      try {
+        byteArrayOutputStream.writeTo(byteArrayOutputStream);
+      } catch (IOException e1) {
+      }
+
+      throw e;
+    }
+
+    try {
+      byteArrayOutputStream.close();
+      return byteArrayOutputStream.toString(HEADER_ENCODING);
+    } catch (IOException e) {
+      return "";
+    }
+  }
+
+  private String getHeaderString(SvnTarget target, String displayPath, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
+    final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    try {
+      boolean stopDisplaying = displayHeader(byteArrayOutputStream, displayPath, deleted, added, operation);
+      if (useGitFormat) {
+        displayGitDiffHeader(byteArrayOutputStream, operation,
+          getRelativeToRootPath(target, originalTarget1),
+          getRelativeToRootPath(target, originalTarget2),
+          copyFromPath);
+      }
+    } catch (SVNException e) {
+      SVNFileUtil.closeFile(byteArrayOutputStream);
+
+      try {
+        byteArrayOutputStream.writeTo(byteArrayOutputStream);
+      } catch (IOException e1) {
+      }
+
+      throw e;
+    }
+
+    try {
+      byteArrayOutputStream.close();
+      return byteArrayOutputStream.toString(HEADER_ENCODING);
+    } catch (IOException e) {
+      return "";
+    }
+  }
+
+  private void runExternalDiffCommand(OutputStream outputStream, final String diffCommand, File file1, File file2, String label1, String label2) throws SVNException {
+    final List<String> args = new ArrayList<String>();
+    args.add(diffCommand);
+    if (rawDiffOptions != null) {
+      args.addAll(rawDiffOptions);
+    } else {
+      Collection svnDiffOptionsCollection = getDiffOptions().toOptionsCollection();
+      args.addAll(svnDiffOptionsCollection);
+      args.add("-u");
+    }
+
+    if (label1 != null) {
+      args.add("-L");
+      args.add(label1);
+    }
+
+    if (label2 != null) {
+      args.add("-L");
+      args.add(label2);
+    }
+
+    boolean tmpFile1 = false;
+    boolean tmpFile2 = false;
+    if (file1 == null) {
+      file1 = SVNFileUtil.createTempFile("svn.", ".tmp");
+      tmpFile1 = true;
+    }
+    if (file2 == null) {
+      file2 = SVNFileUtil.createTempFile("svn.", ".tmp");
+      tmpFile2 = true;
+    }
+
+    String file1Path = file1.getAbsolutePath().replace(File.separatorChar, '/');
+    String file2Path = file2.getAbsolutePath().replace(File.separatorChar, '/');
+
+    args.add(file1Path);
+    args.add(file2Path);
+    try {
+      final Writer writer = new OutputStreamWriter(outputStream, getEncoding());
+
+      SVNFileUtil.execCommand(args.toArray(new String[args.size()]), true,
+        new ISVNReturnValueCallback() {
+
+          public void handleReturnValue(int returnValue) throws SVNException {
+            if (returnValue != 0 && returnValue != 1) {
+              SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.EXTERNAL_PROGRAM,
+                "''{0}'' returned {1}", new Object[]{diffCommand, String.valueOf(returnValue)});
+              SVNErrorManager.error(err, SVNLogType.DEFAULT);
+            }
+          }
+
+          public void handleChar(char ch) throws SVNException {
+            try {
+              writer.write(ch);
+            } catch (IOException ioe) {
+              SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, ioe.getMessage());
+              SVNErrorManager.error(err, ioe, SVNLogType.DEFAULT);
+            }
+          }
+
+          public boolean isHandleProgramOutput() {
+            return true;
+          }
+        });
+
+      writer.flush();
+    } catch (IOException ioe) {
+      SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, ioe.getMessage());
+      SVNErrorManager.error(err, ioe, SVNLogType.DEFAULT);
+    } finally {
+      try {
+        if (tmpFile1) {
+          SVNFileUtil.deleteFile(file1);
+        }
+        if (tmpFile2) {
+          SVNFileUtil.deleteFile(file2);
+        }
+      } catch (SVNException e) {
+        // skip
+      }
+    }
+  }
+
+  private String getExternalDiffCommand() {
+    return externalDiffCommand;
+  }
+
+  private void displayMimeType(OutputStream outputStream, String mimeType) throws SVNException {
+    try {
+      displayString(outputStream, SVNProperty.MIME_TYPE);
+      displayString(outputStream, " = ");
+      displayString(outputStream, mimeType);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayMimeTypes(OutputStream outputStream, String mimeType1, String mimeType2) throws SVNException {
+    try {
+      displayString(outputStream, SVNProperty.MIME_TYPE);
+      displayString(outputStream, " = (");
+      displayString(outputStream, mimeType1);
+      displayString(outputStream, ", ");
+      displayString(outputStream, mimeType2);
+      displayString(outputStream, ")");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayCannotDisplayFileMarkedBinary(OutputStream outputStream) throws SVNException {
+    try {
+      displayString(outputStream, "Cannot display: file marked as a binary type.");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void ensureEncodingAndEOLSet() {
+    if (getEOL() == null) {
+      setEOL(SVNProperty.EOL_LF_BYTES);
+    }
+    if (getEncoding() == null) {
+      final ISVNOptions options = getOptions();
+      if (options != null && options.getNativeCharset() != null) {
+        setEncoding(options.getNativeCharset());
+      } else {
+        setEncoding("UTF-8");
+      }
+    }
+  }
+
+  private void displayPropDiffValues(OutputStream outputStream, SVNProperties diff, SVNProperties baseProps) throws SVNException {
+    for (Iterator changedPropNames = diff.nameSet().iterator(); changedPropNames.hasNext(); ) {
+      String name = (String) changedPropNames.next();
+      SVNPropertyValue originalValue = baseProps != null ? baseProps.getSVNPropertyValue(name) : null;
+      SVNPropertyValue newValue = diff.getSVNPropertyValue(name);
+      String headerFormat = null;
+
+      if (originalValue == null) {
+        headerFormat = "Added: ";
+      } else if (newValue == null) {
+        headerFormat = "Deleted: ";
+      } else {
+        headerFormat = "Modified: ";
+      }
+
+      try {
+        displayString(outputStream, (headerFormat + name));
+        displayEOL(outputStream);
+        if (SVNProperty.MERGE_INFO.equals(name)) {
+          displayMergeInfoDiff(outputStream, originalValue == null ? null : originalValue.getString(), newValue == null ? null : newValue.getString());
+          continue;
+        }
+
+        byte[] originalValueBytes = getPropertyAsBytes(originalValue, getEncoding());
+        byte[] newValueBytes = getPropertyAsBytes(newValue, getEncoding());
+
+        if (originalValueBytes == null) {
+          originalValueBytes = new byte[0];
+        } else {
+          originalValueBytes = maybeAppendEOL(originalValueBytes);
+        }
+
+        boolean newValueHadEol = newValueBytes != null && newValueBytes.length > 0 &&
+          (newValueBytes[newValueBytes.length - 1] == SVNProperty.EOL_CR_BYTES[0] ||
+            newValueBytes[newValueBytes.length - 1] == SVNProperty.EOL_LF_BYTES[0]);
+
+        if (newValueBytes == null) {
+          newValueBytes = new byte[0];
+        } else {
+          newValueBytes = maybeAppendEOL(newValueBytes);
+        }
+
+        QDiffUniGenerator.setup();
+        Map properties = new SVNHashMap();
+
+        properties.put(QDiffGeneratorFactory.IGNORE_EOL_PROPERTY, Boolean.valueOf(getDiffOptions().isIgnoreEOLStyle()));
+        properties.put(QDiffGeneratorFactory.EOL_PROPERTY, new String(getEOL()));
+        properties.put(QDiffGeneratorFactory.HUNK_DELIMITER, "##");
+        if (getDiffOptions().isIgnoreAllWhitespace()) {
+          properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_ALL_SPACE);
+        } else if (getDiffOptions().isIgnoreAmountOfWhitespace()) {
+          properties.put(QDiffGeneratorFactory.IGNORE_SPACE_PROPERTY, QDiffGeneratorFactory.IGNORE_SPACE_CHANGE);
+        }
+
+        QDiffGenerator generator = new QDiffUniGenerator(properties, "");
+        Writer writer = new OutputStreamWriter(outputStream, getEncoding());
+        QDiffManager.generateTextDiff(new ByteArrayInputStream(originalValueBytes), new ByteArrayInputStream(newValueBytes),
+          null, writer, generator);
+        writer.flush();
+        if (!newValueHadEol) {
+          displayString(outputStream, "\\ No newline at end of property");
+          displayEOL(outputStream);
+        }
+      } catch (IOException e) {
+        wrapException(e);
+      }
+    }
+
+  }
+
+  private byte[] maybeAppendEOL(byte[] buffer) {
+    if (buffer.length == 0) {
+      return buffer;
+    }
+
+    byte lastByte = buffer[buffer.length - 1];
+    if (lastByte == SVNProperty.EOL_CR_BYTES[0]) {
+      return buffer;
+    } else if (lastByte != SVNProperty.EOL_LF_BYTES[0]) {
+      final byte[] newBuffer = new byte[buffer.length + getEOL().length];
+      System.arraycopy(buffer, 0, newBuffer, 0, buffer.length);
+      System.arraycopy(getEOL(), 0, newBuffer, buffer.length, getEOL().length);
+      return newBuffer;
+    } else {
+      return buffer;
+    }
+  }
+
+  private String getGitDiffLabel1(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision) {
+    if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+      return getLabel("a/" + path1, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+      return getLabel("a/" + copyFromPath, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+      return getLabel("/dev/null", revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+      return getLabel("a/" + path1, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+      return getLabel("a/" + copyFromPath, revision);
+    }
+    throw new IllegalArgumentException("Unsupported operation: " + operationKind);
+  }
+
+  private String getGitDiffLabel2(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision) {
+    if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+      return getLabel("/dev/null", revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+      return getLabel("b/" + path2, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+      return getLabel("b/" + path2, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+      return getLabel("b/" + path2, revision);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+      return getLabel("b/" + path2, revision);
+    }
+    throw new IllegalArgumentException("Unsupported operation: " + operationKind);
+  }
+
+  private void displayGitDiffHeader(OutputStream outputStream, SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath) throws SVNException {
+    if (operationKind == SvnDiffCallback.OperationKind.Deleted) {
+      displayGitDiffHeaderDeleted(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Copied) {
+      displayGitDiffHeaderCopied(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Added) {
+      displayGitDiffHeaderAdded(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Modified) {
+      displayGitDiffHeaderModified(outputStream, path1, path2, copyFromPath);
+    } else if (operationKind == SvnDiffCallback.OperationKind.Moved) {
+      displayGitDiffHeaderRenamed(outputStream, path1, path2, copyFromPath);
+    }
+  }
+
+  private void displayGitDiffHeaderAdded(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, path1);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "new file mode 10644");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayGitDiffHeaderDeleted(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, path1);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "deleted file mode 10644");
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayGitDiffHeaderCopied(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, copyFromPath);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "copy from ");
+      displayString(outputStream, copyFromPath);
+      displayEOL(outputStream);
+      displayString(outputStream, "copy to ");
+      displayString(outputStream, path2);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayGitDiffHeaderRenamed(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, copyFromPath);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+      displayString(outputStream, "rename from ");
+      displayString(outputStream, copyFromPath);
+      displayEOL(outputStream);
+      displayString(outputStream, "rename to ");
+      displayString(outputStream, path2);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayGitDiffHeaderModified(OutputStream outputStream, String path1, String path2, String copyFromPath) throws SVNException {
+    try {
+      displayString(outputStream, "diff --git ");
+      displayFirstGitPath(outputStream, path1);
+      displayString(outputStream, " ");
+      displaySecondGitPath(outputStream, path2);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayFirstGitPath(OutputStream outputStream, String path1) throws IOException {
+    displayGitPath(outputStream, path1, "a/", false);
+  }
+
+  private void displaySecondGitPath(OutputStream outputStream, String path2) throws IOException {
+    displayGitPath(outputStream, path2, "b/", false);
+  }
+
+  private void displayFirstGitLabelPath(OutputStream outputStream, String path1, String revision1, SvnDiffCallback.OperationKind operation) throws IOException {
+    String pathPrefix = "a/";
+    if (operation == SvnDiffCallback.OperationKind.Added) {
+      path1 = "/dev/null";
+      pathPrefix = "";
+    }
+    displayGitPath(outputStream, getLabel(path1, revision1), pathPrefix, true);
+  }
+
+  private void displaySecondGitLabelPath(OutputStream outputStream, String path2, String revision2, SvnDiffCallback.OperationKind operation) throws IOException {
+    String pathPrefix = "b/";
+    if (operation == SvnDiffCallback.OperationKind.Deleted) {
+      path2 = "/dev/null";
+      pathPrefix = "";
+    }
+    displayGitPath(outputStream, getLabel(path2, revision2), pathPrefix, true);
+  }
+
+  private void displayGitPath(OutputStream outputStream, String path1, String pathPrefix, boolean label) throws IOException {
+//        if (!label && path1.length() == 0) {
+//            displayString(outputStream, ".");
+//        } else {
+    displayString(outputStream, pathPrefix);
+    displayString(outputStream, path1);
+//        }
+  }
+
+  private String getAdjustedPathWithLabel(String displayPath, String path, String revision, String commonAncestor) {
+    String adjustedPath = getAdjustedPath(displayPath, path, commonAncestor);
+    return getLabel(adjustedPath, revision);
+  }
+
+  private String getAdjustedPath(String displayPath, String path1, String commonAncestor) {
+    String adjustedPath = getRelativePath(path1, commonAncestor);
+
+    if (adjustedPath == null || adjustedPath.length() == 0) {
+      adjustedPath = displayPath;
+    } else if (adjustedPath.charAt(0) == '/') {
+      adjustedPath = displayPath + "\t(..." + adjustedPath + ")";
+    } else {
+      adjustedPath = displayPath + "\t(.../" + adjustedPath + ")";
+    }
+    return adjustedPath;
+    //TODO: respect relativeToDir
+  }
+
+  protected String getLabel(String path, String revToken) {
+    revToken = revToken == null ? WC_REVISION_LABEL : revToken;
+    return path + "\t" + revToken;
+  }
+
+  protected boolean displayHeader(OutputStream os, String path, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation) throws SVNException {
+    try {
+      if (deleted && !isDiffDeleted()) {
+        displayString(os, "Index: ");
+        displayString(os, path);
+        displayString(os, " (deleted)");
+        displayEOL(os);
+        displayString(os, HEADER_SEPARATOR);
+        displayEOL(os);
+        return true;
+      }
+      if (added && !isDiffAdded()) {
+        displayString(os, "Index: ");
+        displayString(os, path);
+        displayString(os, " (added)");
+        displayEOL(os);
+        displayString(os, HEADER_SEPARATOR);
+        displayEOL(os);
+        return true;
+      }
+      displayString(os, "Index: ");
+      displayString(os, path);
+      displayEOL(os);
+      displayString(os, HEADER_SEPARATOR);
+      displayEOL(os);
+      return false;
+    } catch (IOException e) {
+      wrapException(e);
+    }
+    return false;
+  }
+
+  protected void displayHeaderFields(OutputStream os, String label1, String label2) throws SVNException {
+    try {
+      displayString(os, "--- ");
+      displayString(os, label1);
+      displayEOL(os);
+      displayString(os, "+++ ");
+      displayString(os, label2);
+      displayEOL(os);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private void displayPropertyChangesOn(String path, OutputStream outputStream) throws SVNException {
+    try {
+      displayEOL(outputStream);
+      displayString(outputStream, ("Property changes on: " + (useLocalFileSeparatorChar() ? path.replace('/', File.separatorChar) : path)));
+      displayEOL(outputStream);
+      displayString(outputStream, PROPERTIES_SEPARATOR);
+      displayEOL(outputStream);
+    } catch (IOException e) {
+      wrapException(e);
+    }
+  }
+
+  private byte[] getPropertyAsBytes(SVNPropertyValue value, String encoding) {
+    if (value == null) {
+      return null;
+    }
+    if (value.isString()) {
+      try {
+        return value.getString().getBytes(encoding);
+      } catch (UnsupportedEncodingException e) {
+        return value.getString().getBytes();
+      }
+    }
+    return value.getBytes();
+  }
+
+  private void displayMergeInfoDiff(OutputStream outputStream, String oldValue, String newValue) throws SVNException, IOException {
+    Map oldMergeInfo = null;
+    Map newMergeInfo = null;
+    if (oldValue != null) {
+      oldMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(oldValue), null);
+    }
+    if (newValue != null) {
+      newMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(newValue), null);
+    }
+
+    Map deleted = new TreeMap();
+    Map added = new TreeMap();
+    SVNMergeInfoUtil.diffMergeInfo(deleted, added, oldMergeInfo, newMergeInfo, true);
+
+    for (Iterator paths = deleted.keySet().iterator(); paths.hasNext(); ) {
+      String path = (String) paths.next();
+      SVNMergeRangeList rangeList = (SVNMergeRangeList) deleted.get(path);
+      displayString(outputStream, ("   Reverse-merged " + path + ":r"));
+      displayString(outputStream, rangeList.toString());
+      displayEOL(outputStream);
+    }
+
+    for (Iterator paths = added.keySet().iterator(); paths.hasNext(); ) {
+      String path = (String) paths.next();
+      SVNMergeRangeList rangeList = (SVNMergeRangeList) added.get(path);
+      displayString(outputStream, ("   Merged " + path + ":r"));
+      displayString(outputStream, rangeList.toString());
+      displayEOL(outputStream);
+    }
+  }
+
+  private boolean useLocalFileSeparatorChar() {
+    return true;
+  }
+
+  public boolean isDiffDeleted() {
+    return diffDeleted;
+  }
+
+  public boolean isDiffAdded() {
+    return diffAdded;
+  }
+
+  private void wrapException(IOException e) throws SVNException {
+    SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, e);
+    SVNErrorManager.error(errorMessage, e, SVNLogType.WC);
+  }
+
+  private void displayString(OutputStream outputStream, String s) throws IOException {
+    outputStream.write(s.getBytes(HEADER_ENCODING));
+  }
+
+  private void displayEOL(OutputStream os) throws IOException {
+    os.write(getEOL());
+  }
+
+  public SVNDiffOptions getDiffOptions() {
+    if (diffOptions == null) {
+      diffOptions = new SVNDiffOptions();
+    }
+    return diffOptions;
+  }
+
+  public void setExternalDiffCommand(String externalDiffCommand) {
+    this.externalDiffCommand = externalDiffCommand;
+  }
+
+  public void setRawDiffOptions(List<String> rawDiffOptions) {
+    this.rawDiffOptions = rawDiffOptions;
+  }
+
+  public void setDiffOptions(SVNDiffOptions diffOptions) {
+    this.diffOptions = diffOptions;
+  }
+
+  public void setDiffDeleted(boolean diffDeleted) {
+    this.diffDeleted = diffDeleted;
+  }
+
+  public void setDiffAdded(boolean diffAdded) {
+    this.diffAdded = diffAdded;
+  }
+
+  public void setBasePath(File absoluteFile) {
+    setBaseTarget(SvnTarget.fromFile(absoluteFile));
+  }
+
+  public void setFallbackToAbsolutePath(boolean fallbackToAbsolutePath) {
+    this.fallbackToAbsolutePath = fallbackToAbsolutePath;
+  }
+
+  public void setOptions(ISVNOptions options) {
+    this.options = options;
+  }
+
+  public ISVNOptions getOptions() {
+    return options;
+  }
+
+  private class EmptyDetectionOutputStream extends OutputStream {
+
+    private final OutputStream outputStream;
+    private boolean somethingWritten;
+
+    public EmptyDetectionOutputStream(OutputStream outputStream) {
+      this.outputStream = outputStream;
+      this.somethingWritten = false;
+    }
+
+    public boolean isSomethingWritten() {
+      return somethingWritten;
+    }
+
+    @Override
+    public void write(int c) throws IOException {
+      somethingWritten = true;
+      outputStream.write(c);
+    }
+
+    @Override
+    public void write(byte[] bytes) throws IOException {
+      somethingWritten = bytes.length > 0;
+      outputStream.write(bytes);
+    }
+
+    @Override
+    public void write(byte[] bytes, int offset, int length) throws IOException {
+      somethingWritten = length > 0;
+      outputStream.write(bytes, offset, length);
+    }
+
+    @Override
+    public void flush() throws IOException {
+      outputStream.flush();
+    }
+
+    @Override
+    public void close() throws IOException {
+      outputStream.close();
+    }
+  }
+}
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
index c46ce5f534..b21f0d091b 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
@@ -43,6 +43,26 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
+/**
+ * This is a copy of the SvnDiffGenerator class from the patched SVNKit library used in SCM-Manager
+ * (a fork of SVNKit from TMate Software (http://svnkit.com/)).
+ *
+ * The original class can be found here: https://bitbucket.org/sdorra/svnkit/src/default/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnDiffGenerator.java
+ *
+ * The folowing modifications are applied when using the git format
+ * <ul>
+ *     <il>
+ *         remove the svn header
+ *     </il>
+ *     <il>
+ *         use the git diff code 100644 on the new file and deleted file actions
+ *     </il>
+ *     <il>
+ *         remove the labels in the added and deleted file headers eg. [+++ a/a.txt (revision 4)] will replaced with [+++ a/a.txt]
+ *     </il>
+ * </ul>
+ */
+@SuppressWarnings("all")
 public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
 
   protected static final String WC_REVISION_LABEL = "(working copy)";
@@ -439,20 +459,21 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
     }
 
     if (!forcedBinaryDiff && (leftIsBinary || rightIsBinary)) {
-      boolean shouldStopDisplaying = displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
-      if (useGitFormat) {
-        displayGitDiffHeader(outputStream, operation,
-          getRelativeToRootPath(target, originalTarget1),
-          getRelativeToRootPath(target, originalTarget2),
-          null);
+      boolean shouldStopDisplaying = false;
+      if (!useGitFormat) {
+        shouldStopDisplaying =  displayHeader(outputStream, displayPath, rightFile == null, leftFile == null, operation);
+      } else {
+        String path1 = getRelativeToRootPath(target, originalTarget1);
+        String path2 = getRelativeToRootPath(target, originalTarget2);
+        displayGitDiffHeader(outputStream, operation,path1,path2,null);
       }
       visitedPaths.add(displayPath);
       if (shouldStopDisplaying) {
         return;
       }
-
-
-      displayBinary(mimeType1, mimeType2, outputStream, leftIsBinary, rightIsBinary);
+      if (!useGitFormat){
+        displayBinary(mimeType1, mimeType2, outputStream, leftIsBinary, rightIsBinary);
+      }
 
       return;
     }
@@ -588,6 +609,7 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
     final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
     try {
       if (!useGitFormat) {
+        // display the svn header only if the git format is not required
         displayHeader(byteArrayOutputStream, displayPath, deleted, added, operation);
       } else {
         displayGitDiffHeader(byteArrayOutputStream, operation,
@@ -888,6 +910,7 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
       displayString(outputStream, " ");
       displaySecondGitPath(outputStream, path2);
       displayEOL(outputStream);
+      // 100644 is the mode code used from git for new and deleted file mode
       displayString(outputStream, "new file mode 100644");
       displayEOL(outputStream);
     } catch (IOException e) {
@@ -902,6 +925,7 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
       displayString(outputStream, " ");
       displaySecondGitPath(outputStream, path2);
       displayEOL(outputStream);
+      // 100644 is the mode code used from git for new and deleted file mode
       displayString(outputStream, "deleted file mode 100644");
       displayEOL(outputStream);
     } catch (IOException e) {
@@ -958,11 +982,11 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
   }
 
   private void displayFirstGitPath(OutputStream outputStream, String path1) throws IOException {
-    displayGitPath(outputStream, path1, "a/", false);
+    displayGitPath(outputStream, path1, "a/");
   }
 
   private void displaySecondGitPath(OutputStream outputStream, String path2) throws IOException {
-    displayGitPath(outputStream, path2, "b/", false);
+    displayGitPath(outputStream, path2, "b/");
   }
 
   private void displayFirstGitLabelPath(OutputStream outputStream, String path1, String revision1, SvnDiffCallback.OperationKind operation) throws IOException {
@@ -971,7 +995,7 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
       path1 = "/dev/null";
       pathPrefix = "";
     }
-    displayGitPath(outputStream, getLabel(path1, revision1), pathPrefix, true);
+    displayGitPath(outputStream, getLabel(path1, revision1), pathPrefix);
   }
 
   private void displaySecondGitLabelPath(OutputStream outputStream, String path2, String revision2, SvnDiffCallback.OperationKind operation) throws IOException {
@@ -980,16 +1004,12 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
       path2 = "/dev/null";
       pathPrefix = "";
     }
-    displayGitPath(outputStream, getLabel(path2, revision2), pathPrefix, true);
+    displayGitPath(outputStream, getLabel(path2, revision2), pathPrefix);
   }
 
-  private void displayGitPath(OutputStream outputStream, String path1, String pathPrefix, boolean label) throws IOException {
-//        if (!label && path1.length() == 0) {
-//            displayString(outputStream, ".");
-//        } else {
+  private void displayGitPath(OutputStream outputStream, String path1, String pathPrefix) throws IOException {
     displayString(outputStream, pathPrefix);
     displayString(outputStream, path1);
-//        }
   }
 
   private String getAdjustedPathWithLabel(String displayPath, String path, String revision, String commonAncestor) {
@@ -1013,6 +1033,7 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
 
   protected String getLabel(String path, String revToken) {
     if (useGitFormat){
+    // the label in the git format contains only the path
       return path;
     }
     revToken = revToken == null ? WC_REVISION_LABEL : revToken;
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java
index 0b65466a42..d05caa1945 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java
@@ -1,19 +1,19 @@
-/**
+/*
  * Copyright (c) 2010, Sebastian Sdorra
  * All rights reserved.
- *
+ * <p>
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- *
+ * <p>
  * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
  * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * <p>
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -24,13 +24,11 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ * <p>
  * http://bitbucket.org/sdorra/scm-manager
- *
  */
 
 
-
 package sonia.scm.repository.spi;
 
 //~--- non-JDK imports --------------------------------------------------------
@@ -41,14 +39,12 @@ import org.slf4j.LoggerFactory;
 import org.tmatesoft.svn.core.SVNDepth;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.wc.DefaultSVNDiffGenerator;
-import org.tmatesoft.svn.core.wc.ISVNDiffGenerator;
+import org.tmatesoft.svn.core.internal.wc2.ng.SvnNewDiffGenerator;
 import org.tmatesoft.svn.core.wc.SVNClientManager;
 import org.tmatesoft.svn.core.wc.SVNDiffClient;
 import org.tmatesoft.svn.core.wc.SVNRevision;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.SvnUtil;
 import sonia.scm.repository.api.DiffFormat;
 import sonia.scm.util.Util;
@@ -61,8 +57,7 @@ import java.io.OutputStream;
  *
  * @author Sebastian Sdorra
  */
-public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand
-{
+public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand {
 
   /**
    * the logger for SvnDiffCommand
@@ -70,46 +65,26 @@ public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand
   private static final Logger logger =
     LoggerFactory.getLogger(SvnDiffCommand.class);
 
-  public SvnDiffCommand(SvnContext context, Repository repository)
-  {
+  public SvnDiffCommand(SvnContext context, Repository repository) {
     super(context, repository);
   }
 
   @Override
-  public void getDiffResult(DiffCommandRequest request, OutputStream output) throws RevisionNotFoundException {
-    if (logger.isDebugEnabled())
-    {
-      logger.debug("create diff for {}", request);
-    }
-
+  public void getDiffResult(DiffCommandRequest request, OutputStream output) {
+    logger.debug("create diff for {}", request);
     Preconditions.checkNotNull(request, "request is required");
     Preconditions.checkNotNull(output, "outputstream is required");
 
     String path = request.getPath();
     SVNClientManager clientManager = null;
-
-    try
-    {
+    try {
       SVNURL svnurl = context.createUrl();
-
-      if (Util.isNotEmpty(path))
-      {
+      if (Util.isNotEmpty(path)) {
         svnurl = svnurl.appendPath(path, true);
       }
-
       clientManager = SVNClientManager.newInstance();
-
       SVNDiffClient diffClient = clientManager.getDiffClient();
-      ISVNDiffGenerator diffGenerator = diffClient.getDiffGenerator();
-
-      if (diffGenerator == null)
-      {
-        diffGenerator = new DefaultSVNDiffGenerator();
-      }
-
-      diffGenerator.setDiffAdded(true);
-      diffGenerator.setDiffDeleted(true);
-      diffClient.setDiffGenerator(diffGenerator);
+      diffClient.setDiffGenerator(new SvnNewDiffGenerator(new SCMSvnDiffGenerator()));
 
       long currentRev = SvnUtil.getRevisionNumber(request.getRevision());
 
@@ -118,13 +93,9 @@ public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand
       diffClient.doDiff(svnurl, SVNRevision.HEAD,
         SVNRevision.create(currentRev - 1), SVNRevision.create(currentRev),
         SVNDepth.INFINITY, false, output);
-    }
-    catch (SVNException ex)
-    {
+    } catch (SVNException ex) {
       throw new InternalRepositoryException("could not create diff", ex);
-    }
-    finally
-    {
+    } finally {
       SvnUtil.dispose(clientManager);
     }
   }
diff --git a/scm-ui/src/repos/components/changesets/ChangesetDetails.js b/scm-ui/src/repos/components/changesets/ChangesetDetails.js
index 26c3120bb8..87b18a0ae1 100644
--- a/scm-ui/src/repos/components/changesets/ChangesetDetails.js
+++ b/scm-ui/src/repos/components/changesets/ChangesetDetails.js
@@ -12,7 +12,7 @@ import AvatarImage from "./AvatarImage";
 import classNames from "classnames";
 import ChangesetId from "./ChangesetId";
 import type {Tag} from "@scm-manager/ui-types";
-import DiffView from "../../containers/DiffView";
+import ScmDiff from "../../containers/ScmDiff";
 
 const styles = {
   spacing: {
@@ -29,56 +29,59 @@ type Props = {
 
 class ChangesetDetails extends React.Component<Props> {
   render() {
-    const { changeset, repository, classes } = this.props;
+    const {changeset, repository, classes} = this.props;
 
     const description = parseDescription(changeset.description);
 
     const id = (
-      <ChangesetId repository={repository} changeset={changeset} link={false} />
+      <ChangesetId repository={repository} changeset={changeset} link={false}/>
     );
-    const date = <DateFromNow date={changeset.date} />;
+    const date = <DateFromNow date={changeset.date}/>;
 
     return (
-      <div className="content">
-        <h4>{description.title}</h4>
-        <article className="media">
-          <AvatarWrapper>
-            <p className={classNames("image", "is-64x64", classes.spacing)}>
-              <AvatarImage changeset={changeset} />
-            </p>
-          </AvatarWrapper>
-          <div className="media-content">
-            <p>
-              <ChangesetAuthor changeset={changeset} />
-            </p>
-            <p>
-              <Interpolate
-                i18nKey="changesets.changeset.summary"
-                id={id}
-                time={date}
-              />
-            </p>
-          </div>
-          <div className="media-right">{this.renderTags()}</div>
-        </article>
-        <p>
-          {description.message.split("\n").map((item, key) => {
-            return (
-              <span key={key}>
+      <div>
+        <div className="content">
+          <h4>{description.title}</h4>
+          <article className="media">
+            <AvatarWrapper>
+              <p className={classNames("image", "is-64x64", classes.spacing)}>
+                <AvatarImage changeset={changeset}/>
+              </p>
+            </AvatarWrapper>
+            <div className="media-content">
+              <p>
+                <ChangesetAuthor changeset={changeset}/>
+              </p>
+              <p>
+                <Interpolate
+                  i18nKey="changesets.changeset.summary"
+                  id={id}
+                  time={date}
+                />
+              </p>
+            </div>
+            <div className="media-right">{this.renderTags()}</div>
+          </article>
+          <p>
+            {description.message.split("\n").map((item, key) => {
+              return (
+                <span key={key}>
                 {item}
-                <br />
+                  <br/>
               </span>
-            );
-          })}
-        </p>
-
-        <DiffView changeset={changeset} sideBySide={false} />
+              );
+            })}
+          </p>
+        </div>
+        <div>
+          <ScmDiff changeset={changeset} sideBySide={false}/>
+        </div>
       </div>
     );
   }
 
   getTags = () => {
-    const { changeset } = this.props;
+    const {changeset} = this.props;
     return changeset._embedded.tags || [];
   };
 
@@ -88,7 +91,7 @@ class ChangesetDetails extends React.Component<Props> {
       return (
         <div className="level-item">
           {tags.map((tag: Tag) => {
-            return <ChangesetTag key={tag.name} tag={tag} />;
+            return <ChangesetTag key={tag.name} tag={tag}/>;
           })}
         </div>
       );
diff --git a/scm-ui/src/repos/components/changesets/changesets.js b/scm-ui/src/repos/components/changesets/changesets.js
index 9d4821e5ec..d6569e284e 100644
--- a/scm-ui/src/repos/components/changesets/changesets.js
+++ b/scm-ui/src/repos/components/changesets/changesets.js
@@ -5,16 +5,17 @@ export type Description = {
 };
 
 export function parseDescription(description: string): Description {
-  const lineBreak = description.indexOf("\n");
-
-  let title;
+  let title = "";
   let message = "";
 
-  if (lineBreak > 0) {
-    title = description.substring(0, lineBreak);
-    message = description.substring(lineBreak + 1);
-  } else {
-    title = description;
+  if (description != null) {
+    const lineBreak = description.indexOf("\n");
+    if (lineBreak > 0) {
+      title = description.substring(0, lineBreak);
+      message = description.substring(lineBreak + 1);
+    } else {
+      title = description;
+    }
   }
 
   return {
diff --git a/scm-ui/src/repos/containers/DiffView.js b/scm-ui/src/repos/containers/ScmDiff.js
similarity index 93%
rename from scm-ui/src/repos/containers/DiffView.js
rename to scm-ui/src/repos/containers/ScmDiff.js
index cd26e74ee6..b2df677eb3 100644
--- a/scm-ui/src/repos/containers/DiffView.js
+++ b/scm-ui/src/repos/containers/ScmDiff.js
@@ -23,7 +23,7 @@ class ScmDiff extends React.Component<Props, State> {
 
   componentDidMount() {
     const { changeset } = this.props;
-    const url = changeset._links.diff.href;
+    const url = changeset._links.diff.href+"?format=GIT";
     apiClient
       .get(url)
       .then(response => response.text())
@@ -35,7 +35,7 @@ class ScmDiff extends React.Component<Props, State> {
     const options = {
       inputFormat: "diff",
       outputFormat: this.props.sideBySide ? "side-by-side" : "line-by-line",
-      showFiles: true,
+      showFiles: false,
       matching: "lines"
     };
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
index 947d8105dc..9687fef817 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
@@ -5,16 +5,19 @@ import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.RevisionNotFoundException;
+import sonia.scm.repository.api.DiffFormat;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.util.HttpUtil;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
+import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
@@ -50,14 +53,15 @@ public class DiffRootResource {
     @ResponseCode(code = 404, condition = "not found, no revision with the specified param for the repository available or repository not found"),
     @ResponseCode(code = 500, condition = "internal server error")
   })
-  public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision){
+  public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision , @DefaultValue("NATIVE") @QueryParam("format") String format ){
     HttpUtil.checkForCRLFInjection(revision);
+    DiffFormat diffFormat = DiffFormat.valueOf(format);
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
       StreamingOutput responseEntry = output -> {
         try {
           repositoryService.getDiffCommand()
             .setRevision(revision)
-//            .setFormat(DiffFormat.GIT) // TODO: Configure this at request time. Maybe as a query param?
+            .setFormat(diffFormat)
             .retriveContent(output);
         } catch (RevisionNotFoundException e) {
           throw new WebApplicationException(Response.Status.NOT_FOUND);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
index fe22c944c4..dc0b838cf6 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
@@ -18,6 +18,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
+import sonia.scm.api.rest.IllegalArgumentExceptionMapper;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryNotFoundException;
@@ -72,6 +73,7 @@ public class DiffResourceTest extends RepositoryTestBase {
     dispatcher.getProviderFactory().registerProvider(NotFoundExceptionMapper.class);
     dispatcher.getProviderFactory().registerProvider(AuthorizationExceptionMapper.class);
     dispatcher.getProviderFactory().registerProvider(CRLFInjectionExceptionMapper.class);
+    dispatcher.getProviderFactory().registerProvider(IllegalArgumentExceptionMapper.class);
     when(service.getDiffCommand()).thenReturn(diffCommandBuilder);
     subjectThreadState.bind();
     ThreadContext.bind(subject);
@@ -86,19 +88,17 @@ public class DiffResourceTest extends RepositoryTestBase {
   @Test
   public void shouldGetDiffs() throws Exception {
     when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder);
+    when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder);
     when(diffCommandBuilder.retriveContent(any())).thenReturn(diffCommandBuilder);
-
     MockHttpRequest request = MockHttpRequest
       .get(DIFF_URL + "revision")
       .accept(VndMediaType.DIFF);
     MockHttpResponse response = new MockHttpResponse();
+
     dispatcher.invoke(request, response);
-    assertEquals(200, response.getStatus());
-    log.info("Response :{}", response.getContentAsString());
+
     assertThat(response.getStatus())
       .isEqualTo(200);
-    assertThat(response.getContentAsString())
-      .isNotNull();
     String expectedHeader = "Content-Disposition";
     String expectedValue = "attachment; filename=\"repo-revision.diff\"; filename*=utf-8''repo-revision.diff";
     assertThat(response.getOutputHeaders().containsKey(expectedHeader)).isTrue();
@@ -120,6 +120,7 @@ public class DiffResourceTest extends RepositoryTestBase {
   @Test
   public void shouldGet404OnMissingRevision() throws Exception {
     when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder);
+    when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder);
     when(diffCommandBuilder.retriveContent(any())).thenThrow(RevisionNotFoundException.class);
 
     MockHttpRequest request = MockHttpRequest
@@ -133,6 +134,7 @@ public class DiffResourceTest extends RepositoryTestBase {
   @Test
   public void shouldGet400OnCrlfInjection() throws Exception {
     when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder);
+    when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder);
     when(diffCommandBuilder.retriveContent(any())).thenThrow(RevisionNotFoundException.class);
 
     MockHttpRequest request = MockHttpRequest
@@ -143,6 +145,17 @@ public class DiffResourceTest extends RepositoryTestBase {
     assertEquals(400, response.getStatus());
   }
 
+  @Test
+  public void shouldGet400OnUnknownFormat() throws Exception {
+    when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder);
+    when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder);
+    when(diffCommandBuilder.retriveContent(any())).thenThrow(RevisionNotFoundException.class);
 
-
+    MockHttpRequest request = MockHttpRequest
+      .get(DIFF_URL + "revision?format=Unknown")
+      .accept(VndMediaType.DIFF);
+    MockHttpResponse response = new MockHttpResponse();
+    dispatcher.invoke(request, response);
+    assertEquals(400, response.getStatus());
+  }
 }

From 007baecc86eef6b60e8ad887d29c17f29fbeafa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 26 Oct 2018 16:43:52 +0200
Subject: [PATCH 039/188] Fix unit test

---
 .../main/java/sonia/scm/user/InvalidPasswordException.java    | 4 ++--
 .../test/java/sonia/scm/api/v2/resources/MeResourceTest.java  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/user/InvalidPasswordException.java b/scm-core/src/main/java/sonia/scm/user/InvalidPasswordException.java
index 11fb11bef5..93a6a7c1d1 100644
--- a/scm-core/src/main/java/sonia/scm/user/InvalidPasswordException.java
+++ b/scm-core/src/main/java/sonia/scm/user/InvalidPasswordException.java
@@ -7,8 +7,8 @@ public class InvalidPasswordException extends ExceptionWithContext {
 
   private static final String CODE = "8YR7aawFW1";
 
-  public InvalidPasswordException(ContextEntry.ContextBuilder passwordChange) {
-    super(passwordChange.build(), "The given old password does not match with the stored one.");
+  public InvalidPasswordException(ContextEntry.ContextBuilder context) {
+    super(context.build(), "The given old password does not match with the stored one.");
   }
 
   @Override
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
index 143b469650..454e24aa92 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
@@ -13,6 +13,7 @@ import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import sonia.scm.ContextEntry;
 import sonia.scm.user.InvalidPasswordException;
 import sonia.scm.user.User;
 import sonia.scm.user.UserManager;
@@ -168,7 +169,8 @@ public class MeResourceTest {
       .content(content.getBytes());
     MockHttpResponse response = new MockHttpResponse();
 
-    doThrow(InvalidPasswordException.class).when(userManager).changePasswordForLoggedInUser(any(), any());
+    doThrow(new InvalidPasswordException(ContextEntry.ContextBuilder.entity("passwortChange", "-")))
+      .when(userManager).changePasswordForLoggedInUser(any(), any());
 
     dispatcher.invoke(request, response);
 

From a0c301f4694e2ae0f8151c7e698150a869b34773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 29 Oct 2018 08:43:11 +0100
Subject: [PATCH 040/188] Include javaee-api in server bundle

---
 scm-it/pom.xml     | 7 -------
 scm-webapp/pom.xml | 1 -
 2 files changed, 8 deletions(-)

diff --git a/scm-it/pom.xml b/scm-it/pom.xml
index 251fe4d957..3f518dd9fe 100644
--- a/scm-it/pom.xml
+++ b/scm-it/pom.xml
@@ -80,13 +80,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>javax</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>7.0</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.json</artifactId>
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 644a1bc0f9..4dfb749690 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -103,7 +103,6 @@
       <groupId>javax</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0</version>
-      <scope>test</scope>
     </dependency>
 
     <!-- rest api -->

From 4425243f03c7acebd6a00901e3676734f675e3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 29 Oct 2018 09:26:23 +0100
Subject: [PATCH 041/188] Adapt ChangePasswordNotAllowedException and mapper

---
 .../user/ChangePasswordNotAllowedException.java  | 16 ++++++++++++----
 .../ChangePasswordNotAllowedExceptionMapper.java | 14 +++++++-------
 .../java/sonia/scm/user/DefaultUserManager.java  |  2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/user/ChangePasswordNotAllowedException.java b/scm-core/src/main/java/sonia/scm/user/ChangePasswordNotAllowedException.java
index fda5e69323..da0b1b0ba3 100644
--- a/scm-core/src/main/java/sonia/scm/user/ChangePasswordNotAllowedException.java
+++ b/scm-core/src/main/java/sonia/scm/user/ChangePasswordNotAllowedException.java
@@ -1,11 +1,19 @@
 package sonia.scm.user;
 
-public class ChangePasswordNotAllowedException extends RuntimeException {
+import sonia.scm.ContextEntry;
+import sonia.scm.ExceptionWithContext;
 
-  public static final String WRONG_USER_TYPE = "User of type %s are not allowed to change password";
+public class ChangePasswordNotAllowedException extends ExceptionWithContext {
 
-  public ChangePasswordNotAllowedException(String type) {
-    super(String.format(WRONG_USER_TYPE, type));
+  private static final String CODE = "9BR7qpDAe1";
+  public static final String WRONG_USER_TYPE = "User of given type are not allowed to change password";
+
+  public ChangePasswordNotAllowedException(ContextEntry.ContextBuilder context) {
+    super(context.build(), WRONG_USER_TYPE);
   }
 
+  @Override
+  public String getCode() {
+    return CODE;
+  }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangePasswordNotAllowedExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangePasswordNotAllowedExceptionMapper.java
index e9bb5304a5..18a6e6e75c 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangePasswordNotAllowedExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangePasswordNotAllowedExceptionMapper.java
@@ -1,17 +1,17 @@
 package sonia.scm.api.v2.resources;
 
+import sonia.scm.api.rest.ContextualExceptionMapper;
 import sonia.scm.user.ChangePasswordNotAllowedException;
+import sonia.scm.user.InvalidPasswordException;
 
+import javax.inject.Inject;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
 @Provider
-public class ChangePasswordNotAllowedExceptionMapper implements ExceptionMapper<ChangePasswordNotAllowedException> {
-  @Override
-  public Response toResponse(ChangePasswordNotAllowedException exception) {
-    return Response.status(Response.Status.BAD_REQUEST)
-      .entity(exception.getMessage())
-      .build();
+public class ChangePasswordNotAllowedExceptionMapper extends ContextualExceptionMapper<ChangePasswordNotAllowedException> {
+  @Inject
+  public ChangePasswordNotAllowedExceptionMapper(ExceptionWithContextToErrorDtoMapper mapper) {
+    super(ChangePasswordNotAllowedException.class, Response.Status.BAD_REQUEST, mapper);
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
index 41d2ed467f..19d6a8343b 100644
--- a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
@@ -422,7 +422,7 @@ public class DefaultUserManager extends AbstractUserManager
       throw new NotFoundException(User.class, userId);
     }
     if (!isTypeDefault(user)) {
-      throw new ChangePasswordNotAllowedException(user.getType());
+      throw new ChangePasswordNotAllowedException(ContextEntry.ContextBuilder.entity("passwordChange", "-").in(User.class, user.getName()));
     }
     user.setPassword(newPassword);
     this.modify(user);

From 463a93553deedb6463e358551c83fe8b0cd137f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 09:32:30 +0100
Subject: [PATCH 042/188] refactoring content view

---
 .../components/content/DownloadViewer.js      | 38 ++-------
 .../src/repos/sources/containers/Content.js   | 77 +++++++++++++++----
 2 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/scm-ui/src/repos/sources/components/content/DownloadViewer.js b/scm-ui/src/repos/sources/components/content/DownloadViewer.js
index d9a96fd886..b902c1f0b3 100644
--- a/scm-ui/src/repos/sources/components/content/DownloadViewer.js
+++ b/scm-ui/src/repos/sources/components/content/DownloadViewer.js
@@ -2,7 +2,7 @@
 import React from "react";
 import { translate } from "react-i18next";
 import type { File } from "@scm-manager/ui-types";
-import { DownloadButton, DateFromNow } from "@scm-manager/ui-components";
+import { DownloadButton } from "@scm-manager/ui-components";
 
 type Props = {
   t: string => string,
@@ -12,39 +12,13 @@ type Props = {
 
 class DownloadViewer extends React.Component<Props> {
   render() {
-    const { t, file, revision } = this.props;
+    const { t, file } = this.props;
     return (
       <div>
-        <article className="media">
-          <div className="content media-left">
-            <h4>{file.name}</h4>
-          </div>
-          <div className="media-content" />
-          <div className="media-right">
-            <DownloadButton
-              url={file._links.self.href}
-              displayName={t("sources.content.downloadButton")}
-            />
-          </div>
-        </article>
-        <table className="table">
-          <tbody>
-            <tr>
-              <td>{t("sources.description")}</td>
-              <td>{file.description}</td>
-            </tr>
-            <tr>
-              <td>{t("sources.lastModified")}</td>
-              <td>
-                <DateFromNow date={file.lastModified} />
-              </td>
-            </tr>
-            <tr>
-              <td>{t("sources.branch")}</td>
-              <td>{revision}</td>
-            </tr>
-          </tbody>
-        </table>
+        <DownloadButton
+          url={file._links.self.href}
+          displayName={t("sources.content.downloadButton")}
+        />
       </div>
     );
   }
diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index 9506e637aa..68e02aece2 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -1,20 +1,23 @@
 // @flow
 import React from "react";
-import { translate } from "react-i18next";
+import { Interpolate, translate } from "react-i18next";
 import { apiClient } from "@scm-manager/ui-components";
 import { getSources } from "../modules/sources";
-import type {
-  Repository,
-  File
-} from "@scm-manager/ui-types";
+import type { Repository, File } from "@scm-manager/ui-types";
 import {
   ErrorNotification,
-  Loading
+  Loading,
+  DateFromNow
 } from "@scm-manager/ui-components";
 import { connect } from "react-redux";
 import ImageViewer from "../components/content/ImageViewer";
 import SourcecodeViewer from "../components/content/SourcecodeViewer";
 import DownloadViewer from "../components/content/DownloadViewer";
+import FileSize from "../components/FileSize";
+import AvatarWrapper from "../../components/changesets/AvatarWrapper";
+import classNames from "classnames";
+import AvatarImage from "../../components/changesets/AvatarImage";
+import ChangesetAuthor from "../../components/changesets/ChangesetAuthor";
 
 type Props = {
   t: string => string,
@@ -67,9 +70,47 @@ class Content extends React.Component<Props, State> {
       .catch(err => {});
   }
 
-  render() {
+  showHeader() {
+    const { file, revision, t } = this.props;
+    const date = <DateFromNow date={file.lastModified} />;
+    const fileSize = file.directory ? "" : <FileSize bytes={file.length} />;
+
+    return (
+      <div className="content">
+        <h4>{file.name}</h4>
+        <article className="media">
+          <div className="media-content">
+            <p>
+              {file.description.split("\n").map((item, key) => {
+                return (
+                  <span key={key}>
+                    {item}
+                    <br />
+                  </span>
+                );
+              })}
+            </p>
+          </div>
+          <div className="media-right">{date}</div>
+        </article>
+      </div>
+    );
+  }
+
+  showContent() {
     const { file, revision } = this.props;
     const contentType = this.state.contentType;
+    if (contentType.startsWith("image")) {
+      return <ImageViewer />;
+    } else if (contentType.startsWith("text")) {
+      return <SourcecodeViewer />;
+    } else {
+      return <DownloadViewer file={file} revision={revision} />;
+    }
+  }
+
+  render() {
+    const { file } = this.props;
     const error = this.state.error;
     const hasError = this.state.hasError;
 
@@ -79,15 +120,23 @@ class Content extends React.Component<Props, State> {
     if (hasError) {
       return <ErrorNotification error={error} />;
     }
-    if (contentType.startsWith("image")) {
-      return <ImageViewer />;
-    }
 
-    if (contentType.startsWith("text")) {
-      return <SourcecodeViewer />;
-    }
+    const header = this.showHeader();
+    const content = this.showContent();
+    const fileSize = file.directory ? "" : <FileSize bytes={file.length} />;
 
-    return <DownloadViewer file={file} revision={revision}/>;
+    return (
+      <div>
+        {header}
+        <nav className="panel">
+          <article className="panel-heading media">
+            <div className="media-content">{file.name}</div>
+            <div className="media-right">{fileSize}</div>
+          </article>
+          <div className="panel-block">{content}</div>
+        </nav>
+      </div>
+    );
   }
 }
 

From 224b8e6af4d2924379f4eee82b67908bf0d1938d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 29 Oct 2018 09:41:10 +0100
Subject: [PATCH 043/188] Add type back to exception message

---
 .../sonia/scm/user/ChangePasswordNotAllowedException.java   | 6 +++---
 .../src/main/java/sonia/scm/user/DefaultUserManager.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/user/ChangePasswordNotAllowedException.java b/scm-core/src/main/java/sonia/scm/user/ChangePasswordNotAllowedException.java
index da0b1b0ba3..caa35e0b88 100644
--- a/scm-core/src/main/java/sonia/scm/user/ChangePasswordNotAllowedException.java
+++ b/scm-core/src/main/java/sonia/scm/user/ChangePasswordNotAllowedException.java
@@ -6,10 +6,10 @@ import sonia.scm.ExceptionWithContext;
 public class ChangePasswordNotAllowedException extends ExceptionWithContext {
 
   private static final String CODE = "9BR7qpDAe1";
-  public static final String WRONG_USER_TYPE = "User of given type are not allowed to change password";
+  public static final String WRONG_USER_TYPE = "User of type %s are not allowed to change password";
 
-  public ChangePasswordNotAllowedException(ContextEntry.ContextBuilder context) {
-    super(context.build(), WRONG_USER_TYPE);
+  public ChangePasswordNotAllowedException(ContextEntry.ContextBuilder context, String type) {
+    super(context.build(), String.format(WRONG_USER_TYPE, type));
   }
 
   @Override
diff --git a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
index 19d6a8343b..33762a5941 100644
--- a/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
@@ -422,7 +422,7 @@ public class DefaultUserManager extends AbstractUserManager
       throw new NotFoundException(User.class, userId);
     }
     if (!isTypeDefault(user)) {
-      throw new ChangePasswordNotAllowedException(ContextEntry.ContextBuilder.entity("passwordChange", "-").in(User.class, user.getName()));
+      throw new ChangePasswordNotAllowedException(ContextEntry.ContextBuilder.entity("passwordChange", "-").in(User.class, user.getName()), user.getType());
     }
     user.setPassword(newPassword);
     this.modify(user);

From 866409c8df0a77e3830acc4568c1cf2c0705de6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 09:59:04 +0100
Subject: [PATCH 044/188] center download button

---
 .../components/content/DownloadViewer.js      |  5 ++--
 .../src/repos/sources/containers/Content.js   | 23 ++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/scm-ui/src/repos/sources/components/content/DownloadViewer.js b/scm-ui/src/repos/sources/components/content/DownloadViewer.js
index b902c1f0b3..8355a61e32 100644
--- a/scm-ui/src/repos/sources/components/content/DownloadViewer.js
+++ b/scm-ui/src/repos/sources/components/content/DownloadViewer.js
@@ -7,14 +7,15 @@ import { DownloadButton } from "@scm-manager/ui-components";
 type Props = {
   t: string => string,
   file: File,
-  revision: string
+  revision: string,
+  classes: any
 };
 
 class DownloadViewer extends React.Component<Props> {
   render() {
     const { t, file } = this.props;
     return (
-      <div>
+      <div className="has-text-centered">
         <DownloadButton
           url={file._links.self.href}
           displayName={t("sources.content.downloadButton")}
diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index 68e02aece2..2ceb702896 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -14,10 +14,8 @@ import ImageViewer from "../components/content/ImageViewer";
 import SourcecodeViewer from "../components/content/SourcecodeViewer";
 import DownloadViewer from "../components/content/DownloadViewer";
 import FileSize from "../components/FileSize";
-import AvatarWrapper from "../../components/changesets/AvatarWrapper";
+import injectSheet from "react-jss";
 import classNames from "classnames";
-import AvatarImage from "../../components/changesets/AvatarImage";
-import ChangesetAuthor from "../../components/changesets/ChangesetAuthor";
 
 type Props = {
   t: string => string,
@@ -39,6 +37,12 @@ type State = {
   hasError: boolean
 };
 
+const styles = {
+  toCenterContent: {
+    display: "block"
+  }
+};
+
 class Content extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props);
@@ -71,9 +75,8 @@ class Content extends React.Component<Props, State> {
   }
 
   showHeader() {
-    const { file, revision, t } = this.props;
+    const { file } = this.props;
     const date = <DateFromNow date={file.lastModified} />;
-    const fileSize = file.directory ? "" : <FileSize bytes={file.length} />;
 
     return (
       <div className="content">
@@ -110,7 +113,7 @@ class Content extends React.Component<Props, State> {
   }
 
   render() {
-    const { file } = this.props;
+    const { file, classes } = this.props;
     const error = this.state.error;
     const hasError = this.state.hasError;
 
@@ -133,7 +136,9 @@ class Content extends React.Component<Props, State> {
             <div className="media-content">{file.name}</div>
             <div className="media-right">{fileSize}</div>
           </article>
-          <div className="panel-block">{content}</div>
+          <div className={classNames("panel-block", classes.toCenterContent)}>
+            {content}
+          </div>
         </nav>
       </div>
     );
@@ -161,4 +166,6 @@ const mapStateToProps = (state: any, ownProps: Props) => {
   };
 };
 
-export default connect(mapStateToProps)(translate("repos")(Content));
+export default injectSheet(styles)(
+  connect(mapStateToProps)(translate("repos")(Content))
+);

From 8a07287b58e0d363eb73b141d51ad95842b5213b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 29 Oct 2018 10:10:53 +0100
Subject: [PATCH 045/188] Fix unit tests

---
 .../test/java/sonia/scm/api/v2/resources/DispatcherMock.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
index 0d95d0a642..4bda5c875d 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
@@ -18,7 +18,7 @@ public class DispatcherMock {
     dispatcher.getProviderFactory().register(new ConcurrentModificationExceptionMapper(mapper));
     dispatcher.getProviderFactory().registerProvider(AuthorizationExceptionMapper.class);
     dispatcher.getProviderFactory().registerProvider(InternalRepositoryExceptionMapper.class);
-    dispatcher.getProviderFactory().registerProvider(ChangePasswordNotAllowedExceptionMapper.class);
+    dispatcher.getProviderFactory().register(new ChangePasswordNotAllowedExceptionMapper(mapper));
     dispatcher.getProviderFactory().register(new InvalidPasswordExceptionMapper(mapper));
     dispatcher.getProviderFactory().registerProvider(IllegalArgumentExceptionMapper.class);
     return dispatcher;

From f1c9fe56f0fd1a44588ec292973054450147dc04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 29 Oct 2018 10:30:17 +0100
Subject: [PATCH 046/188] Fix unit test

---
 .../java/sonia/scm/api/v2/resources/UserRootResourceTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
index 1451498124..077381cc37 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
@@ -14,6 +14,7 @@ import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import sonia.scm.ContextEntry;
 import sonia.scm.NotFoundException;
 import sonia.scm.PageResult;
 import sonia.scm.user.ChangePasswordNotAllowedException;
@@ -167,7 +168,7 @@ public class UserRootResourceTest {
       .content(content.getBytes());
     MockHttpResponse response = new MockHttpResponse();
 
-    doThrow(ChangePasswordNotAllowedException.class).when(userManager).overwritePassword(any(), any());
+    doThrow(new ChangePasswordNotAllowedException(ContextEntry.ContextBuilder.entity("passwordChange", "-"), "xml")).when(userManager).overwritePassword(any(), any());
 
     dispatcher.invoke(request, response);
 

From abad7d905c59292223a6bcdea03ea1233d389c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 10:46:16 +0100
Subject: [PATCH 047/188] show image

---
 .../components/content/DownloadViewer.js      |  4 +--
 .../sources/components/content/ImageViewer.js | 29 ++++++++-----------
 .../src/repos/sources/containers/Content.js   |  2 +-
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/scm-ui/src/repos/sources/components/content/DownloadViewer.js b/scm-ui/src/repos/sources/components/content/DownloadViewer.js
index 8355a61e32..4b84d7a53d 100644
--- a/scm-ui/src/repos/sources/components/content/DownloadViewer.js
+++ b/scm-ui/src/repos/sources/components/content/DownloadViewer.js
@@ -6,9 +6,7 @@ import { DownloadButton } from "@scm-manager/ui-components";
 
 type Props = {
   t: string => string,
-  file: File,
-  revision: string,
-  classes: any
+  file: File
 };
 
 class DownloadViewer extends React.Component<Props> {
diff --git a/scm-ui/src/repos/sources/components/content/ImageViewer.js b/scm-ui/src/repos/sources/components/content/ImageViewer.js
index 0b5eae20d7..ca0fc64a3c 100644
--- a/scm-ui/src/repos/sources/components/content/ImageViewer.js
+++ b/scm-ui/src/repos/sources/components/content/ImageViewer.js
@@ -1,28 +1,23 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
+import type { File } from "@scm-manager/ui-types";
 
 type Props = {
-  t: string => string
+  t: string => string,
+  file: File
 };
 
-type State = {
-  content: string
-};
-
-class ImageViewer extends React.Component<Props, State> {
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      content: ""
-    };
-  }
-
-  componentDidMount() {}
-
+class ImageViewer extends React.Component<Props> {
   render() {
-    return "ImageViewer";
+    const { file } = this.props;
+    return (
+      <div className="has-text-centered">
+        <figure>
+          <img src={file._links.self.href} />
+        </figure>
+      </div>
+    );
   }
 }
 
diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index 2ceb702896..f3d9871b33 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -104,7 +104,7 @@ class Content extends React.Component<Props, State> {
     const { file, revision } = this.props;
     const contentType = this.state.contentType;
     if (contentType.startsWith("image")) {
-      return <ImageViewer />;
+      return <ImageViewer file={file} />;
     } else if (contentType.startsWith("text")) {
       return <SourcecodeViewer />;
     } else {

From 370bcd1845b375d7f628a456b24fc3f0276938c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 11:50:55 +0100
Subject: [PATCH 048/188] show source code

---
 scm-ui/package.json                           |   1 +
 .../components/content/SourcecodeViewer.js    |  82 +++++++++-
 .../content/SourcecodeViewer.test.js          |  14 +-
 .../src/repos/sources/containers/Content.js   |   9 +-
 .../repos/sources/containers/Content.test.js  |   2 +-
 scm-ui/yarn.lock                              | 150 +++++++++++++++++-
 6 files changed, 243 insertions(+), 15 deletions(-)

diff --git a/scm-ui/package.json b/scm-ui/package.json
index de42ff2a36..f88fe75c85 100644
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -23,6 +23,7 @@
     "react-redux": "^5.0.7",
     "react-router-dom": "^4.3.1",
     "react-router-redux": "^5.0.0-alpha.9",
+    "react-syntax-highlighter": "^9.0.1",
     "redux": "^4.0.0",
     "redux-devtools-extension": "^2.13.5",
     "redux-logger": "^3.0.6",
diff --git a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
index dacbbd6283..d1b6dadb61 100644
--- a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
@@ -1,14 +1,23 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import { apiClient } from "../../../../../../scm-ui-components/packages/ui-components/src/index";
+import { apiClient } from "@scm-manager/ui-components";
+import type { File } from "@scm-manager/ui-types";
+import { ErrorNotification, Loading } from "@scm-manager/ui-components";
+import SyntaxHighlighter from "react-syntax-highlighter";
+import { arduinoLight } from "react-syntax-highlighter/styles/hljs";
 
 type Props = {
-  t: string => string
+  t: string => string,
+  file: File,
+  contentType: string
 };
 
 type State = {
-  content: string
+  content: string,
+  error: Error,
+  hasError: boolean,
+  loaded: boolean
 };
 
 class SourcecodeViewer extends React.Component<Props, State> {
@@ -16,23 +25,82 @@ class SourcecodeViewer extends React.Component<Props, State> {
     super(props);
 
     this.state = {
-      content: ""
+      content: "",
+      error: new Error(),
+      hasError: false,
+      loaded: false
     };
   }
 
-  componentDidMount() {}
+  componentDidMount() {
+    const { file } = this.props;
+    getContent(file._links.self.href)
+      .then(result => {
+        if (result.error) {
+          this.setState({
+            ...this.state,
+            hasError: true,
+            error: result.error,
+            loaded: true
+          });
+        } else {
+          this.setState({
+            ...this.state,
+            content: result,
+            loaded: true
+          });
+        }
+      })
+      .catch(err => {});
+  }
 
   render() {
-    return "sourceCodeViewer";
+    const content = this.state.content;
+    const error = this.state.error;
+    const hasError = this.state.hasError;
+    const loaded = this.state.loaded;
+    const { contentType } = this.props;
+
+    if (hasError) {
+      return <ErrorNotification error={error} />;
+    }
+
+    if (!loaded) {
+      return <Loading />;
+    }
+
+    if (!content) {
+      return null;
+    }
+
+    return (
+      <SyntaxHighlighter
+        showLineNumbers="true"
+        language={getLanguage(contentType)}
+        style={arduinoLight}
+      >
+        {content}
+      </SyntaxHighlighter>
+    );
   }
 }
 
+export function getLanguage(contentType: string) {
+  return contentType.substring(
+    contentType.indexOf("/") + 1,
+    contentType.length
+  );
+}
+
 export function getContent(url: string) {
   return apiClient
     .get(url)
     .then(response => response.text())
+    .then(content => {
+      return content;
+    })
     .catch(err => {
-      return null;
+      return { error: err };
     });
 }
 
diff --git a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
index 0007db50ba..a318b8854a 100644
--- a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
@@ -1,10 +1,9 @@
 //@flow
 import fetchMock from "fetch-mock";
-import { getContent } from "./SourcecodeViewer";
+import { getContent, getLanguage } from "./SourcecodeViewer";
 
 describe("get content", () => {
-  const CONTENT_URL =
-    "/repositories/scmadmin/TestRepo/content/testContent";
+  const CONTENT_URL = "/repositories/scmadmin/TestRepo/content/testContent";
 
   afterEach(() => {
     fetchMock.reset();
@@ -20,3 +19,12 @@ describe("get content", () => {
     });
   });
 });
+
+describe("get correct language Type", () => {
+  it("should return javascript", () => {
+    expect(getLanguage("application/javascript")).toBe("javascript");
+  });
+  it("should return text", () => {
+    expect(getLanguage("text/plain")).toBe("plain");
+  });
+});
diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index f3d9871b33..a9f2e46df9 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -1,6 +1,6 @@
 // @flow
 import React from "react";
-import { Interpolate, translate } from "react-i18next";
+import { translate } from "react-i18next";
 import { apiClient } from "@scm-manager/ui-components";
 import { getSources } from "../modules/sources";
 import type { Repository, File } from "@scm-manager/ui-types";
@@ -105,8 +105,11 @@ class Content extends React.Component<Props, State> {
     const contentType = this.state.contentType;
     if (contentType.startsWith("image")) {
       return <ImageViewer file={file} />;
-    } else if (contentType.startsWith("text")) {
-      return <SourcecodeViewer />;
+    } else if (
+      contentType.startsWith("text") ||
+      contentType.startsWith("application")
+    ) {
+      return <SourcecodeViewer file={file} contentType={contentType} />;
     } else {
       return <DownloadViewer file={file} revision={revision} />;
     }
diff --git a/scm-ui/src/repos/sources/containers/Content.test.js b/scm-ui/src/repos/sources/containers/Content.test.js
index ef115accd4..8de2f48b18 100644
--- a/scm-ui/src/repos/sources/containers/Content.test.js
+++ b/scm-ui/src/repos/sources/containers/Content.test.js
@@ -20,7 +20,7 @@ describe("get content type", () => {
     });
 
     getContentType(CONTENT_URL).then(content => {
-      expect(content).toBe("application/text");
+      expect(content.type).toBe("application/text");
       done();
     });
   });
diff --git a/scm-ui/yarn.lock b/scm-ui/yarn.lock
index 18b198622c..ec4789b544 100644
--- a/scm-ui/yarn.lock
+++ b/scm-ui/yarn.lock
@@ -1181,7 +1181,7 @@ babel-register@^6.26.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.15"
 
-babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   dependencies:
@@ -1739,6 +1739,18 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+character-entities-legacy@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz#7c6defb81648498222c9855309953d05f4d63a9c"
+
+character-entities@^1.0.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.2.tgz#58c8f371c0774ef0ba9b2aca5f00d8f100e6e363"
+
+character-reference-invalid@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz#21e421ad3d84055952dab4a43a04e73cd425d3ed"
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -1840,6 +1852,14 @@ cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
 
+clipboard@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.1.tgz#a12481e1c13d8a50f5f036b0560fe5d16d74e46a"
+  dependencies:
+    good-listener "^1.2.2"
+    select "^1.1.2"
+    tiny-emitter "^2.0.0"
+
 cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
@@ -1946,6 +1966,12 @@ combined-stream@^1.0.5, combined-stream@~1.0.5, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
+comma-separated-tokens@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.5.tgz#b13793131d9ea2d2431cf5b507ddec258f0ce0db"
+  dependencies:
+    trim "0.0.1"
+
 commander@^2.11.0, commander@^2.17.1, commander@^2.2.0, commander@^2.9.0:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
@@ -2327,6 +2353,10 @@ delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
 
+delegate@^3.1.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
+
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -3068,6 +3098,12 @@ fast-xml-parser@^3.12.0:
   dependencies:
     nimnjs "^1.3.2"
 
+fault@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.2.tgz#c3d0fec202f172a3a4d414042ad2bb5e2a3ffbaa"
+  dependencies:
+    format "^0.2.2"
+
 fb-watchman@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
@@ -3280,6 +3316,10 @@ form-data@~2.3.1, form-data@~2.3.2:
     combined-stream "1.0.6"
     mime-types "^2.1.12"
 
+format@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
+
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -3569,6 +3609,12 @@ glogg@^1.0.0:
   dependencies:
     sparkles "^1.0.0"
 
+good-listener@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
+  dependencies:
+    delegate "^3.1.2"
+
 got@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a"
@@ -3814,6 +3860,19 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hast-util-parse-selector@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.0.tgz#2175f18cdd697308fc3431d5c29a9e48dfa4817a"
+
+hastscript@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-4.1.0.tgz#ea5593fa6f6709101fc790ced818393ddaa045ce"
+  dependencies:
+    comma-separated-tokens "^1.0.0"
+    hast-util-parse-selector "^2.2.0"
+    property-information "^4.0.0"
+    space-separated-tokens "^1.0.0"
+
 hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
@@ -3823,6 +3882,10 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
+highlight.js@~9.12.0:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
+
 history@^4.7.2:
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"
@@ -4115,6 +4178,17 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-alphabetical@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.2.tgz#1fa6e49213cb7885b75d15862fb3f3d96c884f41"
+
+is-alphanumerical@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz#1138e9ae5040158dc6ff76b820acd6b7a181fd40"
+  dependencies:
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -4165,6 +4239,10 @@ is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
 
+is-decimal@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.2.tgz#894662d6a8709d307f3a276ca4339c8fa5dff0ff"
+
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -4251,6 +4329,10 @@ is-glob@^4.0.0:
   dependencies:
     is-extglob "^2.1.1"
 
+is-hexadecimal@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz#b6e710d7d07bb66b98cb8cece5c9b4921deeb835"
+
 is-in-browser@^1.0.2, is-in-browser@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
@@ -5320,6 +5402,13 @@ lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
+lowlight@~1.9.1:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.9.2.tgz#0b9127e3cec2c3021b7795dd81005c709a42fdd1"
+  dependencies:
+    fault "^1.0.2"
+    highlight.js "~9.12.0"
+
 lru-cache@2:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
@@ -6175,6 +6264,17 @@ parse-asn1@^5.0.0:
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
 
+parse-entities@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.0.tgz#9deac087661b2e36814153cb78d7e54a4c5fd6f4"
+  dependencies:
+    character-entities "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    character-reference-invalid "^1.0.0"
+    is-alphanumerical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-hexadecimal "^1.0.0"
+
 parse-filepath@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
@@ -6422,6 +6522,12 @@ pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
+prismjs@^1.8.4, prismjs@~1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.15.0.tgz#8801d332e472091ba8def94976c8877ad60398d9"
+  optionalDependencies:
+    clipboard "^2.0.0"
+
 private@^0.1.6, private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -6456,6 +6562,12 @@ prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+property-information@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz#f0e66e07cbd6fed31d96844d958d153ad3eb486e"
+  dependencies:
+    xtend "^4.0.1"
+
 ps-tree@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014"
@@ -6653,6 +6765,16 @@ react-router@^4.2.0, react-router@^4.3.1:
     prop-types "^15.6.1"
     warning "^4.0.1"
 
+react-syntax-highlighter@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-9.0.1.tgz#cad91692e1976f68290f24762ac3451b1fec3d26"
+  dependencies:
+    babel-runtime "^6.18.0"
+    highlight.js "~9.12.0"
+    lowlight "~1.9.1"
+    prismjs "^1.8.4"
+    refractor "^2.4.1"
+
 react-test-renderer@^16.0.0-0, react-test-renderer@^16.4.1:
   version "16.5.2"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.5.2.tgz#92e9d2c6f763b9821b2e0b22f994ee675068b5ae"
@@ -6811,6 +6933,14 @@ redux@^4.0.0:
     loose-envify "^1.1.0"
     symbol-observable "^1.2.0"
 
+refractor@^2.4.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/refractor/-/refractor-2.6.0.tgz#6b0d88f654c8534eefed3329a35bc7bb74ae0979"
+  dependencies:
+    hastscript "^4.0.0"
+    parse-entities "^1.1.2"
+    prismjs "~1.15.0"
+
 regenerate-unicode-properties@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
@@ -7172,6 +7302,10 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
+select@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
+
 "semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
@@ -7440,6 +7574,12 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
+space-separated-tokens@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.2.tgz#e95ab9d19ae841e200808cd96bc7bd0adbbb3412"
+  dependencies:
+    trim "0.0.1"
+
 sparkles@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
@@ -7834,6 +7974,10 @@ timers-ext@^0.1.5:
     es5-ext "~0.10.46"
     next-tick "1"
 
+tiny-emitter@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c"
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -7917,6 +8061,10 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+trim@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
+
 "true-case-path@^1.0.2":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"

From 7734b68d0bf212aae5c3d34fbf96a67f22c2f049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 13:19:16 +0100
Subject: [PATCH 049/188] add source code viewer for different languages

---
 .../components/content/SourcecodeViewer.js    | 21 ++++++++++++++++++-
 .../content/SourcecodeViewer.test.js          | 11 +++++++++-
 .../src/repos/sources/containers/Content.js   |  1 +
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
index d1b6dadb61..8c0d27661b 100644
--- a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
@@ -86,10 +86,29 @@ class SourcecodeViewer extends React.Component<Props, State> {
 }
 
 export function getLanguage(contentType: string) {
-  return contentType.substring(
+  const language = contentType.substring(
     contentType.indexOf("/") + 1,
     contentType.length
   );
+
+  let languageType;
+
+  switch (language) {
+    case "x-go":
+      languageType = "go";
+      break;
+    case "x-java-source":
+      languageType = "java";
+      break;
+    case "x-web-markdown":
+      languageType = "markdown";
+      break;
+    default:
+      languageType = language;
+  }
+
+  console.log(languageType);
+  return languageType;
 }
 
 export function getContent(url: string) {
diff --git a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
index a318b8854a..a33dba454b 100644
--- a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
@@ -20,11 +20,20 @@ describe("get content", () => {
   });
 });
 
-describe("get correct language Type", () => {
+describe("get correct language type", () => {
   it("should return javascript", () => {
     expect(getLanguage("application/javascript")).toBe("javascript");
   });
   it("should return text", () => {
     expect(getLanguage("text/plain")).toBe("plain");
   });
+  it("should return go", () => {
+    expect(getLanguage("text/x-go")).toBe("go");
+  });
+  it("should return java", () => {
+    expect(getLanguage("text/x-java-source")).toBe("java");
+  });
+  it("should return markdown", () => {
+    expect(getLanguage("text/x-web-markdown")).toBe("markdown");
+  });
 });
diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index a9f2e46df9..23e33c407d 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -152,6 +152,7 @@ export function getContentType(url: string, state: any) {
   return apiClient
     .head(url)
     .then(response => {
+      console.log(response.headers.get("Content-Type"));
       return { type: response.headers.get("Content-Type") };
     })
     .catch(err => {

From a9d7cceb22fc42b342953a9e7ff375b20bfb5985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 13:42:56 +0100
Subject: [PATCH 050/188] eslint fixes

---
 scm-ui/src/config/containers/GlobalConfig.js  |  2 +-
 scm-ui/src/config/modules/config.test.js      |  1 -
 scm-ui/src/containers/App.js                  |  3 +--
 scm-ui/src/containers/Logout.js               |  2 +-
 scm-ui/src/groups/containers/AddGroup.js      |  3 +--
 scm-ui/src/index.js                           |  3 +--
 scm-ui/src/modules/auth.js                    |  6 +++---
 .../sources/components/content/ImageViewer.js |  2 +-
 .../components/content/SourcecodeViewer.js    |  1 -
 .../src/repos/sources/containers/Content.js   |  1 -
 .../src/repos/sources/modules/sources.test.js | 21 -------------------
 11 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/scm-ui/src/config/containers/GlobalConfig.js b/scm-ui/src/config/containers/GlobalConfig.js
index 252e880a42..6046aa4a09 100644
--- a/scm-ui/src/config/containers/GlobalConfig.js
+++ b/scm-ui/src/config/containers/GlobalConfig.js
@@ -14,7 +14,7 @@ import {
   modifyConfigReset
 } from "../modules/config";
 import { connect } from "react-redux";
-import type { Config, Link } from "@scm-manager/ui-types";
+import type { Config } from "@scm-manager/ui-types";
 import ConfigForm from "../components/form/ConfigForm";
 import { getConfigLink } from "../../modules/indexResource";
 
diff --git a/scm-ui/src/config/modules/config.test.js b/scm-ui/src/config/modules/config.test.js
index 12c6b347c3..b6c97826b0 100644
--- a/scm-ui/src/config/modules/config.test.js
+++ b/scm-ui/src/config/modules/config.test.js
@@ -22,7 +22,6 @@ import reducer, {
   getConfig,
   getConfigUpdatePermission
 } from "./config";
-import { getConfigLink } from "../../modules/indexResource";
 
 const CONFIG_URL = "/config";
 const URL = "/api/v2" + CONFIG_URL;
diff --git a/scm-ui/src/containers/App.js b/scm-ui/src/containers/App.js
index 768b1776d4..50fc805eb2 100644
--- a/scm-ui/src/containers/App.js
+++ b/scm-ui/src/containers/App.js
@@ -19,9 +19,8 @@ import {
   Footer,
   Header
 } from "@scm-manager/ui-components";
-import type { Me, Link } from "@scm-manager/ui-types";
+import type { Me } from "@scm-manager/ui-types";
 import {
-  fetchIndexResources,
   getConfigLink,
   getFetchIndexResourcesFailure,
   getGroupsLink,
diff --git a/scm-ui/src/containers/Logout.js b/scm-ui/src/containers/Logout.js
index 7875a6b92a..fe6662da42 100644
--- a/scm-ui/src/containers/Logout.js
+++ b/scm-ui/src/containers/Logout.js
@@ -11,7 +11,7 @@ import {
   getLogoutFailure
 } from "../modules/auth";
 import { Loading, ErrorPage } from "@scm-manager/ui-components";
-import { fetchIndexResources, getLogoutLink } from "../modules/indexResource";
+import { getLogoutLink } from "../modules/indexResource";
 
 type Props = {
   authenticated: boolean,
diff --git a/scm-ui/src/groups/containers/AddGroup.js b/scm-ui/src/groups/containers/AddGroup.js
index bcb19846b8..9b13ac0309 100644
--- a/scm-ui/src/groups/containers/AddGroup.js
+++ b/scm-ui/src/groups/containers/AddGroup.js
@@ -9,8 +9,7 @@ import {
   createGroup,
   isCreateGroupPending,
   getCreateGroupFailure,
-  createGroupReset,
-  getCreateGroupLink
+  createGroupReset
 } from "../modules/groups";
 import type { Group } from "@scm-manager/ui-types";
 import type { History } from "history";
diff --git a/scm-ui/src/index.js b/scm-ui/src/index.js
index 3ecd38e6d0..08e3e8a58c 100644
--- a/scm-ui/src/index.js
+++ b/scm-ui/src/index.js
@@ -14,7 +14,6 @@ import type { BrowserHistory } from "history/createBrowserHistory";
 
 import createReduxStore from "./createReduxStore";
 import { ConnectedRouter } from "react-router-redux";
-import PluginLoader from "./containers/PluginLoader";
 
 import { urls } from "@scm-manager/ui-components";
 
@@ -37,7 +36,7 @@ ReactDOM.render(
     <I18nextProvider i18n={i18n}>
       {/* ConnectedRouter will use the store from Provider automatically */}
       <ConnectedRouter history={history}>
-          <Index />
+        <Index />
       </ConnectedRouter>
     </I18nextProvider>
   </Provider>,
diff --git a/scm-ui/src/modules/auth.js b/scm-ui/src/modules/auth.js
index fd5068aeb8..fe636ac9d3 100644
--- a/scm-ui/src/modules/auth.js
+++ b/scm-ui/src/modules/auth.js
@@ -7,8 +7,8 @@ import { isPending } from "./pending";
 import { getFailure } from "./failure";
 import {
   callFetchIndexResources,
-  FETCH_INDEXRESOURCES_SUCCESS,
-  fetchIndexResources, fetchIndexResourcesPending,
+  fetchIndexResources,
+  fetchIndexResourcesPending,
   fetchIndexResourcesSuccess
 } from "./indexResource";
 
@@ -156,7 +156,7 @@ export const login = (
     return apiClient
       .post(loginLink, login_data)
       .then(response => {
-        dispatch(fetchIndexResourcesPending())
+        dispatch(fetchIndexResourcesPending());
         return callFetchIndexResources();
       })
       .then(response => {
diff --git a/scm-ui/src/repos/sources/components/content/ImageViewer.js b/scm-ui/src/repos/sources/components/content/ImageViewer.js
index ca0fc64a3c..67003fa357 100644
--- a/scm-ui/src/repos/sources/components/content/ImageViewer.js
+++ b/scm-ui/src/repos/sources/components/content/ImageViewer.js
@@ -14,7 +14,7 @@ class ImageViewer extends React.Component<Props> {
     return (
       <div className="has-text-centered">
         <figure>
-          <img src={file._links.self.href} />
+          <img src={file._links.self.href} alt={file._links.self.href} />
         </figure>
       </div>
     );
diff --git a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
index 8c0d27661b..3917e851b9 100644
--- a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
@@ -107,7 +107,6 @@ export function getLanguage(contentType: string) {
       languageType = language;
   }
 
-  console.log(languageType);
   return languageType;
 }
 
diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index 23e33c407d..a9f2e46df9 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -152,7 +152,6 @@ export function getContentType(url: string, state: any) {
   return apiClient
     .head(url)
     .then(response => {
-      console.log(response.headers.get("Content-Type"));
       return { type: response.headers.get("Content-Type") };
     })
     .catch(err => {
diff --git a/scm-ui/src/repos/sources/modules/sources.test.js b/scm-ui/src/repos/sources/modules/sources.test.js
index f6336bba53..1a5c81e908 100644
--- a/scm-ui/src/repos/sources/modules/sources.test.js
+++ b/scm-ui/src/repos/sources/modules/sources.test.js
@@ -95,27 +95,6 @@ const noDirectory: File = {
   _embedded: collection
 };
 
-const directory: File = {
-  name: "package.json",
-  path: "package.json",
-  directory: false,
-  description: "bump version",
-  length: 780,
-  lastModified: "2017-07-31T11:17:19Z",
-  revision: "abc",
-  _links: {
-    self: {
-      href:
-        "http://localhost:8081/scm/rest/api/v2/repositories/scm/core/content/76aae4bb4ceacf0e88938eb5b6832738b7d537b4/package.json"
-    },
-    history: {
-      href:
-        "http://localhost:8081/scm/rest/api/v2/repositories/scm/core/sources/history/76aae4bb4ceacf0e88938eb5b6832738b7d537b4/package.json"
-    }
-  },
-  _embedded: {}
-};
-
 describe("sources fetch", () => {
   const mockStore = configureMockStore([thunk]);
 

From 9b10d1d4ea21d660ae6acc0db565f25e27494224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 13:56:16 +0100
Subject: [PATCH 051/188] check if description exists before using it

---
 .../src/repos/sources/containers/Content.js   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index a9f2e46df9..4a91e57cf2 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -77,23 +77,24 @@ class Content extends React.Component<Props, State> {
   showHeader() {
     const { file } = this.props;
     const date = <DateFromNow date={file.lastModified} />;
+    const description = file.description ? (
+      <p>
+        {file.description.split("\n").map((item, key) => {
+          return (
+            <span key={key}>
+              {item}
+              <br />
+            </span>
+          );
+        })}
+      </p>
+    ) : null;
 
     return (
       <div className="content">
         <h4>{file.name}</h4>
         <article className="media">
-          <div className="media-content">
-            <p>
-              {file.description.split("\n").map((item, key) => {
-                return (
-                  <span key={key}>
-                    {item}
-                    <br />
-                  </span>
-                );
-              })}
-            </p>
-          </div>
+          <div className="media-content">{description}</div>
           <div className="media-right">{date}</div>
         </article>
       </div>

From 188bb54094b6f983eff705dd8b73b28e18e77ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 14:11:37 +0100
Subject: [PATCH 052/188] show branch in content view

---
 scm-ui/src/repos/sources/containers/Content.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index 4a91e57cf2..c6c3cecd30 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -75,7 +75,7 @@ class Content extends React.Component<Props, State> {
   }
 
   showHeader() {
-    const { file } = this.props;
+    const { file, revision } = this.props;
     const date = <DateFromNow date={file.lastModified} />;
     const description = file.description ? (
       <p>
@@ -89,10 +89,16 @@ class Content extends React.Component<Props, State> {
         })}
       </p>
     ) : null;
+    const branch = "[" + revision + "]";
 
     return (
       <div className="content">
-        <h4>{file.name}</h4>
+        <div className="columns">
+          <div className="column is-narrow">
+            <h4>{file.name}</h4>
+          </div>
+          <div className="column">{branch}</div>
+        </div>
         <article className="media">
           <div className="media-content">{description}</div>
           <div className="media-right">{date}</div>

From 06ca66d9f17e4be53ad810cd0cf9fc570bdebab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 14:53:24 +0100
Subject: [PATCH 053/188] use header instead of content type

---
 .../components/content/SourcecodeViewer.js    | 60 +++++++++++--------
 .../content/SourcecodeViewer.test.js          | 36 +++++++----
 2 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
index 3917e851b9..648c99d29a 100644
--- a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
@@ -15,6 +15,7 @@ type Props = {
 
 type State = {
   content: string,
+  language: string,
   error: Error,
   hasError: boolean,
   loaded: boolean
@@ -26,6 +27,7 @@ class SourcecodeViewer extends React.Component<Props, State> {
 
     this.state = {
       content: "",
+      language: "",
       error: new Error(),
       hasError: false,
       loaded: false
@@ -34,6 +36,22 @@ class SourcecodeViewer extends React.Component<Props, State> {
 
   componentDidMount() {
     const { file } = this.props;
+    getProgrammingLanguage(file._links.self.href)
+      .then(result => {
+        if (result.error) {
+          this.setState({
+            ...this.state,
+            hasError: true,
+            error: result.error
+          });
+        } else {
+          this.setState({
+            ...this.state,
+            language: result.language
+          });
+        }
+      })
+      .catch(err => {});
     getContent(file._links.self.href)
       .then(result => {
         if (result.error) {
@@ -59,7 +77,7 @@ class SourcecodeViewer extends React.Component<Props, State> {
     const error = this.state.error;
     const hasError = this.state.hasError;
     const loaded = this.state.loaded;
-    const { contentType } = this.props;
+    const language = this.state.language;
 
     if (hasError) {
       return <ErrorNotification error={error} />;
@@ -76,7 +94,7 @@ class SourcecodeViewer extends React.Component<Props, State> {
     return (
       <SyntaxHighlighter
         showLineNumbers="true"
-        language={getLanguage(contentType)}
+        language={getLanguage(language)}
         style={arduinoLight}
       >
         {content}
@@ -85,37 +103,27 @@ class SourcecodeViewer extends React.Component<Props, State> {
   }
 }
 
-export function getLanguage(contentType: string) {
-  const language = contentType.substring(
-    contentType.indexOf("/") + 1,
-    contentType.length
-  );
+export function getLanguage(language: string) {
+  return language.toLowerCase();
+}
 
-  let languageType;
-
-  switch (language) {
-    case "x-go":
-      languageType = "go";
-      break;
-    case "x-java-source":
-      languageType = "java";
-      break;
-    case "x-web-markdown":
-      languageType = "markdown";
-      break;
-    default:
-      languageType = language;
-  }
-
-  return languageType;
+export function getProgrammingLanguage(url: string) {
+  return apiClient
+    .head(url)
+    .then(response => {
+      return { language: response.headers.get("Language") };
+    })
+    .catch(err => {
+      return { error: err };
+    });
 }
 
 export function getContent(url: string) {
   return apiClient
     .get(url)
     .then(response => response.text())
-    .then(content => {
-      return content;
+    .then(response => {
+      return response;
     })
     .catch(err => {
       return { error: err };
diff --git a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
index a33dba454b..b132721e3b 100644
--- a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
@@ -1,6 +1,10 @@
 //@flow
 import fetchMock from "fetch-mock";
-import { getContent, getLanguage } from "./SourcecodeViewer";
+import {
+  getContent,
+  getLanguage,
+  getProgrammingLanguage
+} from "./SourcecodeViewer";
 
 describe("get content", () => {
   const CONTENT_URL = "/repositories/scmadmin/TestRepo/content/testContent";
@@ -18,22 +22,28 @@ describe("get content", () => {
       done();
     });
   });
+
+  it("should return language", done => {
+    let headers = {
+      Language: "JAVA"
+    };
+
+    fetchMock.head("/api/v2" + CONTENT_URL, {
+      headers
+    });
+
+    getProgrammingLanguage(CONTENT_URL).then(content => {
+      expect(content.language).toBe("JAVA");
+      done();
+    });
+  });
 });
 
 describe("get correct language type", () => {
   it("should return javascript", () => {
-    expect(getLanguage("application/javascript")).toBe("javascript");
+    expect(getLanguage("JAVASCRIPT")).toBe("javascript");
   });
-  it("should return text", () => {
-    expect(getLanguage("text/plain")).toBe("plain");
-  });
-  it("should return go", () => {
-    expect(getLanguage("text/x-go")).toBe("go");
-  });
-  it("should return java", () => {
-    expect(getLanguage("text/x-java-source")).toBe("java");
-  });
-  it("should return markdown", () => {
-    expect(getLanguage("text/x-web-markdown")).toBe("markdown");
+  it("should return nothing for plain text", () => {
+    expect(getLanguage("")).toBe("");
   });
 });

From 1b60095373103024c3aefbf09c7f9133d32b6705 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 29 Oct 2018 14:55:56 +0100
Subject: [PATCH 054/188] do not cache resource urls in development stage, to
 avoid stale data

---
 .../plugin/DefaultUberWebResourceLoader.java  | 43 +++++++++++++------
 .../DefaultUberWebResourceLoaderTest.java     | 16 +++++--
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultUberWebResourceLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultUberWebResourceLoader.java
index 115a63fc2f..6b886dd5ce 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultUberWebResourceLoader.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultUberWebResourceLoader.java
@@ -41,6 +41,8 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sonia.scm.SCMContext;
+import sonia.scm.Stage;
 
 import javax.servlet.ServletContext;
 import java.net.MalformedURLException;
@@ -69,19 +71,21 @@ public class DefaultUberWebResourceLoader implements UberWebResourceLoader
 
   //~--- constructors ---------------------------------------------------------
 
-  /**
-   * Constructs ...
-   *
-   *
-   * @param servletContext
-   * @param plugins
-   */
-  public DefaultUberWebResourceLoader(ServletContext servletContext,
-    Iterable<PluginWrapper> plugins)
-  {
+  public DefaultUberWebResourceLoader(ServletContext servletContext, Iterable<PluginWrapper> plugins) {
+    this(servletContext, plugins, SCMContext.getContext().getStage());
+  }
+
+  public DefaultUberWebResourceLoader(ServletContext servletContext, Iterable<PluginWrapper> plugins, Stage stage) {
     this.servletContext = servletContext;
     this.plugins = plugins;
-    this.cache = CacheBuilder.newBuilder().build();
+    this.cache = createCache(stage);
+  }
+
+  private final Cache<String, URL> createCache(Stage stage) {
+    if (stage == Stage.DEVELOPMENT) {
+      return null;
+    }
+    return CacheBuilder.newBuilder().build();
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -97,7 +101,7 @@ public class DefaultUberWebResourceLoader implements UberWebResourceLoader
   @Override
   public URL getResource(String path)
   {
-    URL resource = cache.getIfPresent(path);
+    URL resource = getFromCache(path);
 
     if (resource == null)
     {
@@ -105,7 +109,7 @@ public class DefaultUberWebResourceLoader implements UberWebResourceLoader
 
       if (resource != null)
       {
-        cache.put(path, resource);
+        addToCache(path, resource);
       }
     }
     else
@@ -116,6 +120,19 @@ public class DefaultUberWebResourceLoader implements UberWebResourceLoader
     return resource;
   }
 
+  private URL getFromCache(String path) {
+    if (cache != null) {
+      return cache.getIfPresent(path);
+    }
+    return null;
+  }
+
+  private void addToCache(String path, URL url) {
+    if (cache != null) {
+      cache.put(path, url);
+    }
+  }
+
   /**
    * Method description
    *
diff --git a/scm-webapp/src/test/java/sonia/scm/plugin/DefaultUberWebResourceLoaderTest.java b/scm-webapp/src/test/java/sonia/scm/plugin/DefaultUberWebResourceLoaderTest.java
index 42b038ab17..9e5ebccbfd 100644
--- a/scm-webapp/src/test/java/sonia/scm/plugin/DefaultUberWebResourceLoaderTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/plugin/DefaultUberWebResourceLoaderTest.java
@@ -42,6 +42,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import sonia.scm.Stage;
 
 import javax.servlet.ServletContext;
 import java.io.File;
@@ -96,14 +97,12 @@ public class DefaultUberWebResourceLoaderTest extends WebResourceLoaderTestBase
    * Method description
    *
    *
-   * @throws MalformedURLException
    */
   @Test
-  public void testGetResourceFromCache() throws MalformedURLException
-  {
+  public void testGetResourceFromCache() {
     DefaultUberWebResourceLoader resourceLoader =
       new DefaultUberWebResourceLoader(servletContext,
-        new ArrayList<PluginWrapper>());
+        new ArrayList<PluginWrapper>(), Stage.PRODUCTION);
 
     resourceLoader.getCache().put("/myresource", GITHUB);
 
@@ -112,6 +111,15 @@ public class DefaultUberWebResourceLoaderTest extends WebResourceLoaderTestBase
     assertSame(GITHUB, resource);
   }
 
+  @Test
+  public void testGetResourceCacheIsDisableInStageDevelopment() throws MalformedURLException {
+    DefaultUberWebResourceLoader resourceLoader = new DefaultUberWebResourceLoader(servletContext, new ArrayList<>(), Stage.DEVELOPMENT);
+    when(servletContext.getResource("/scm")).thenAnswer(invocation -> new URL("https://scm-manager.org"));
+    URL url = resourceLoader.getResource("/scm");
+    URL secondUrl = resourceLoader.getResource("/scm");
+    assertNotSame(url, secondUrl);
+  }
+
   /**
    * Method description
    *

From 7a60e976a10cf423e0d3df4751e4ba869e0009fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 15:05:59 +0100
Subject: [PATCH 055/188] change name of programming language in header

---
 .../main/java/sonia/scm/api/v2/resources/ContentResource.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java
index dc7c305823..99ed29e6f6 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java
@@ -136,7 +136,7 @@ public class ContentResource {
   private void appendContentHeader(String path, byte[] head, Response.ResponseBuilder responseBuilder) {
     ContentType contentType = ContentTypes.detect(path, head);
     responseBuilder.header("Content-Type", contentType.getRaw());
-    contentType.getLanguage().ifPresent(language -> responseBuilder.header("Language", language));
+    contentType.getLanguage().ifPresent(language -> responseBuilder.header("X-Programming-Language", language));
   }
 
   private byte[] getHead(String revision, String path, RepositoryService repositoryService) throws IOException, PathNotFoundException, RevisionNotFoundException {

From 17f1d9aa824bd5732c79c3d66a97bf90da34d3df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 29 Oct 2018 15:21:48 +0100
Subject: [PATCH 056/188] Correct link

---
 scm-ui/src/repos/components/list/RepositoryEntry.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scm-ui/src/repos/components/list/RepositoryEntry.js b/scm-ui/src/repos/components/list/RepositoryEntry.js
index ef1df0d3d9..bc170144aa 100644
--- a/scm-ui/src/repos/components/list/RepositoryEntry.js
+++ b/scm-ui/src/repos/components/list/RepositoryEntry.js
@@ -1,9 +1,9 @@
 //@flow
 import React from "react";
-import {Link} from "react-router-dom";
+import { Link } from "react-router-dom";
 import injectSheet from "react-jss";
-import type {Repository} from "@scm-manager/ui-types";
-import {DateFromNow} from "@scm-manager/ui-components";
+import type { Repository } from "@scm-manager/ui-types";
+import { DateFromNow } from "@scm-manager/ui-components";
 import RepositoryEntryLink from "./RepositoryEntryLink";
 import classNames from "classnames";
 import RepositoryAvatar from "./RepositoryAvatar";
@@ -45,7 +45,7 @@ class RepositoryEntry extends React.Component<Props> {
       return (
         <RepositoryEntryLink
           iconClass="fa-code-branch"
-          to={repositoryLink + "/history"}
+          to={repositoryLink + "/changesets"}
         />
       );
     }

From e67f68c364da6ca231c6fe149a3773dd8ea1faaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 15:27:21 +0100
Subject: [PATCH 057/188] use correct header

---
 scm-ui/src/repos/sources/components/content/SourcecodeViewer.js | 2 +-
 .../repos/sources/components/content/SourcecodeViewer.test.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
index 648c99d29a..d679c3be3d 100644
--- a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
@@ -111,7 +111,7 @@ export function getProgrammingLanguage(url: string) {
   return apiClient
     .head(url)
     .then(response => {
-      return { language: response.headers.get("Language") };
+      return { language: response.headers.get("X-Programming-Language") };
     })
     .catch(err => {
       return { error: err };
diff --git a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
index b132721e3b..68c9cba00a 100644
--- a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
@@ -25,7 +25,7 @@ describe("get content", () => {
 
   it("should return language", done => {
     let headers = {
-      Language: "JAVA"
+      "X-Programming-Language": "JAVA"
     };
 
     fetchMock.head("/api/v2" + CONTENT_URL, {

From dd0eda6c4b5ee297f769095959762460d825fd91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 15:57:31 +0100
Subject: [PATCH 058/188] check language for deciding which viewer to see

---
 .../components/content/SourcecodeViewer.js    | 33 +----------------
 .../content/SourcecodeViewer.test.js          | 18 +--------
 .../src/repos/sources/containers/Content.js   | 37 ++++++++++++-------
 .../repos/sources/containers/Content.test.js  |  4 +-
 4 files changed, 29 insertions(+), 63 deletions(-)

diff --git a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
index d679c3be3d..c19338e639 100644
--- a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
@@ -10,12 +10,11 @@ import { arduinoLight } from "react-syntax-highlighter/styles/hljs";
 type Props = {
   t: string => string,
   file: File,
-  contentType: string
+  language: string
 };
 
 type State = {
   content: string,
-  language: string,
   error: Error,
   hasError: boolean,
   loaded: boolean
@@ -27,7 +26,6 @@ class SourcecodeViewer extends React.Component<Props, State> {
 
     this.state = {
       content: "",
-      language: "",
       error: new Error(),
       hasError: false,
       loaded: false
@@ -36,22 +34,6 @@ class SourcecodeViewer extends React.Component<Props, State> {
 
   componentDidMount() {
     const { file } = this.props;
-    getProgrammingLanguage(file._links.self.href)
-      .then(result => {
-        if (result.error) {
-          this.setState({
-            ...this.state,
-            hasError: true,
-            error: result.error
-          });
-        } else {
-          this.setState({
-            ...this.state,
-            language: result.language
-          });
-        }
-      })
-      .catch(err => {});
     getContent(file._links.self.href)
       .then(result => {
         if (result.error) {
@@ -77,7 +59,7 @@ class SourcecodeViewer extends React.Component<Props, State> {
     const error = this.state.error;
     const hasError = this.state.hasError;
     const loaded = this.state.loaded;
-    const language = this.state.language;
+    const language = this.props.language;
 
     if (hasError) {
       return <ErrorNotification error={error} />;
@@ -107,17 +89,6 @@ export function getLanguage(language: string) {
   return language.toLowerCase();
 }
 
-export function getProgrammingLanguage(url: string) {
-  return apiClient
-    .head(url)
-    .then(response => {
-      return { language: response.headers.get("X-Programming-Language") };
-    })
-    .catch(err => {
-      return { error: err };
-    });
-}
-
 export function getContent(url: string) {
   return apiClient
     .get(url)
diff --git a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
index 68c9cba00a..11e701f626 100644
--- a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.test.js
@@ -2,8 +2,7 @@
 import fetchMock from "fetch-mock";
 import {
   getContent,
-  getLanguage,
-  getProgrammingLanguage
+  getLanguage
 } from "./SourcecodeViewer";
 
 describe("get content", () => {
@@ -22,21 +21,6 @@ describe("get content", () => {
       done();
     });
   });
-
-  it("should return language", done => {
-    let headers = {
-      "X-Programming-Language": "JAVA"
-    };
-
-    fetchMock.head("/api/v2" + CONTENT_URL, {
-      headers
-    });
-
-    getProgrammingLanguage(CONTENT_URL).then(content => {
-      expect(content.language).toBe("JAVA");
-      done();
-    });
-  });
 });
 
 describe("get correct language type", () => {
diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index c6c3cecd30..4a66eb3670 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -33,8 +33,10 @@ type Props = {
 
 type State = {
   contentType: string,
+  language: string,
   error: Error,
-  hasError: boolean
+  hasError: boolean,
+  loaded: boolean
 };
 
 const styles = {
@@ -49,8 +51,10 @@ class Content extends React.Component<Props, State> {
 
     this.state = {
       contentType: "",
+      language: "",
       error: new Error(),
-      hasError: false
+      hasError: false,
+      loaded: false
     };
   }
 
@@ -62,12 +66,15 @@ class Content extends React.Component<Props, State> {
           this.setState({
             ...this.state,
             hasError: true,
-            error: result.error
+            error: result.error,
+            loaded: true
           });
         } else {
           this.setState({
             ...this.state,
-            contentType: result.type
+            contentType: result.type,
+            language: result.language,
+            loaded: true
           });
         }
       })
@@ -108,17 +115,15 @@ class Content extends React.Component<Props, State> {
   }
 
   showContent() {
-    const { file, revision } = this.props;
+    const { file } = this.props;
     const contentType = this.state.contentType;
-    if (contentType.startsWith("image")) {
+    const language = this.state.language;
+    if (contentType.startsWith("image/")) {
       return <ImageViewer file={file} />;
-    } else if (
-      contentType.startsWith("text") ||
-      contentType.startsWith("application")
-    ) {
-      return <SourcecodeViewer file={file} contentType={contentType} />;
+    } else if (language) {
+      return <SourcecodeViewer file={file} language={language}/>;
     } else {
-      return <DownloadViewer file={file} revision={revision} />;
+      return <DownloadViewer file={file} />;
     }
   }
 
@@ -126,8 +131,9 @@ class Content extends React.Component<Props, State> {
     const { file, classes } = this.props;
     const error = this.state.error;
     const hasError = this.state.hasError;
+    const loaded = this.state.loaded;
 
-    if (!file) {
+    if (!file || !loaded) {
       return <Loading />;
     }
     if (hasError) {
@@ -159,7 +165,10 @@ export function getContentType(url: string, state: any) {
   return apiClient
     .head(url)
     .then(response => {
-      return { type: response.headers.get("Content-Type") };
+      return {
+        type: response.headers.get("Content-Type"),
+        language: response.headers.get("X-Programming-Language")
+      };
     })
     .catch(err => {
       return { error: err };
diff --git a/scm-ui/src/repos/sources/containers/Content.test.js b/scm-ui/src/repos/sources/containers/Content.test.js
index 8de2f48b18..36116b35aa 100644
--- a/scm-ui/src/repos/sources/containers/Content.test.js
+++ b/scm-ui/src/repos/sources/containers/Content.test.js
@@ -12,7 +12,8 @@ describe("get content type", () => {
 
   it("should return content", done => {
     let headers = {
-      "Content-Type": "application/text"
+      "Content-Type": "application/text",
+      "X-Programming-Language": "JAVA"
     };
 
     fetchMock.head("/api/v2" + CONTENT_URL, {
@@ -21,6 +22,7 @@ describe("get content type", () => {
 
     getContentType(CONTENT_URL).then(content => {
       expect(content.type).toBe("application/text");
+      expect(content.language).toBe("JAVA");
       done();
     });
   });

From f87cd922374bb75c3671659e1226bfb37d328f77 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 29 Oct 2018 16:35:53 +0100
Subject: [PATCH 059/188] added type definitions for react-i18next

---
 .../flow-typed/npm/react-i18next_v7.x.x.js    | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 scm-ui-components/packages/ui-components/flow-typed/npm/react-i18next_v7.x.x.js

diff --git a/scm-ui-components/packages/ui-components/flow-typed/npm/react-i18next_v7.x.x.js b/scm-ui-components/packages/ui-components/flow-typed/npm/react-i18next_v7.x.x.js
new file mode 100644
index 0000000000..93d27674d7
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/flow-typed/npm/react-i18next_v7.x.x.js
@@ -0,0 +1,95 @@
+// flow-typed signature: 65d42f62f8de603dcc631ea5a6b00580
+// flow-typed version: f3f13164e0/react-i18next_v7.x.x/flow_>=v0.64.x
+
+declare module "react-i18next" {
+  declare type TFunction = (key?: ?string, data?: ?Object) => string;
+
+  declare type TranslatorProps = {|
+    t: TFunction,
+    i18nLoadedAt: Date,
+    i18n: Object
+  |};
+
+  declare type TranslatorPropsVoid = {
+    t: TFunction | void,
+    i18nLoadedAt: Date | void,
+    i18n: Object | void
+  };
+
+  declare type Translator<P: {}, Component: React$ComponentType<P>> = (
+    WrappedComponent: Component
+  ) => React$ComponentType<
+    $Diff<React$ElementConfig<Component>, TranslatorPropsVoid>
+  >;
+
+  declare type TranslateOptions = $Shape<{
+    wait: boolean,
+    nsMode: "default" | "fallback",
+    bindi18n: false | string,
+    bindStore: false | string,
+    withRef: boolean,
+    translateFuncName: string,
+    i18n: Object,
+    usePureComponent: boolean
+  }>;
+
+  declare function translate<P: {}, Component: React$ComponentType<P>>(
+    namespaces?: | string
+    | Array<string>
+    | (($Diff<P, TranslatorPropsVoid>) => string | Array<string>),
+    options?: TranslateOptions
+  ): Translator<P, Component>;
+
+  declare type I18nProps = {
+    i18n?: Object,
+    ns?: string | Array<string>,
+    children: (t: TFunction, { i18n: Object, t: TFunction }) => React$Node,
+    initialI18nStore?: Object,
+    initialLanguage?: string
+  };
+  declare var I18n: React$ComponentType<I18nProps>;
+
+  declare type InterpolateProps = {
+    className?: string,
+    dangerouslySetInnerHTMLPartElement?: string,
+    i18n?: Object,
+    i18nKey?: string,
+    options?: Object,
+    parent?: string,
+    style?: Object,
+    t?: TFunction,
+    useDangerouslySetInnerHTML?: boolean
+  };
+  declare var Interpolate: React$ComponentType<InterpolateProps>;
+
+  declare type TransProps = {
+    count?: number,
+    parent?: string,
+    i18n?: Object,
+    i18nKey?: string,
+    t?: TFunction
+  };
+  declare var Trans: React$ComponentType<TransProps>;
+
+  declare type ProviderProps = { i18n: Object, children: React$Element<*> };
+  declare var I18nextProvider: React$ComponentType<ProviderProps>;
+
+  declare type NamespacesProps = {
+    components: Array<React$ComponentType<*>>,
+    i18n: { loadNamespaces: Function }
+  };
+  declare function loadNamespaces(props: NamespacesProps): Promise<void>;
+
+  declare var reactI18nextModule: {
+    type: "3rdParty",
+    init: (instance: Object) => void
+  };
+
+  declare function setDefaults(options: TranslateOptions): void;
+
+  declare function getDefaults(): TranslateOptions;
+
+  declare function getI18n(): Object;
+
+  declare function setI18n(instance: Object): void;
+}

From 8a10ac27e351b4428678a11e6913f126968b316e Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 29 Oct 2018 16:38:11 +0100
Subject: [PATCH 060/188] update ui-bundler to 0.0.19 and smp-maven-plugin to
 1.0.0-alpha-3

---
 scm-plugins/pom.xml                           | 95 ++++---------------
 scm-plugins/scm-git-plugin/package.json       |  7 +-
 scm-plugins/scm-git-plugin/pom.xml            | 40 +++-----
 scm-plugins/scm-git-plugin/yarn.lock          |  6 +-
 scm-plugins/scm-hg-plugin/package.json        |  2 +-
 scm-plugins/scm-hg-plugin/pom.xml             | 42 +++-----
 scm-plugins/scm-hg-plugin/yarn.lock           |  7 +-
 scm-plugins/scm-legacy-plugin/pom.xml         | 17 +++-
 scm-plugins/scm-svn-plugin/package.json       |  2 +-
 scm-plugins/scm-svn-plugin/pom.xml            | 42 +++-----
 scm-plugins/scm-svn-plugin/yarn.lock          |  6 +-
 .../packages/ui-components/package.json       |  2 +-
 .../packages/ui-components/yarn.lock          |  6 +-
 .../packages/ui-types/package.json            |  2 +-
 scm-ui-components/packages/ui-types/yarn.lock |  6 +-
 scm-ui/package.json                           |  2 +-
 scm-ui/yarn.lock                              |  6 +-
 17 files changed, 98 insertions(+), 192 deletions(-)

diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml
index 16a74549e5..94d751dff7 100644
--- a/scm-plugins/pom.xml
+++ b/scm-plugins/pom.xml
@@ -113,92 +113,35 @@
       <plugin>
         <groupId>sonia.scm.maven</groupId>
         <artifactId>smp-maven-plugin</artifactId>
-        <version>1.0.0-alpha-2</version>
+        <version>1.0.0-alpha-3</version>
         <extensions>true</extensions>
         <configuration>
-          <disableCompression>true</disableCompression>
+          <links>
+            <link>@scm-manager/ui-types</link>
+            <link>@scm-manager/ui-components</link>
+          </links>
         </configuration>
-        <executions>
-          <execution>
-            <id>fix-descriptor</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>fix-descriptor</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>append-dependencies</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>append-dependencies</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
 
-      <plugin>
-        <groupId>com.github.sdorra</groupId>
-        <artifactId>buildfrontend-maven-plugin</artifactId>
-        <configuration>
-          <node>
-            <version>${nodejs.version}</version>
-          </node>
-          <pkgManager>
-            <type>YARN</type>
-            <version>${yarn.version}</version>
-          </pkgManager>
-          <failOnMissingPackageJson>false</failOnMissingPackageJson>
-          <script>build</script>
-        </configuration>
-        <executions>
-          <execution>
-            <id>install</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>install</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>build</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+    <plugin>
+      <groupId>com.github.sdorra</groupId>
+      <artifactId>buildfrontend-maven-plugin</artifactId>
+      <configuration>
+        <node>
+          <version>${nodejs.version}</version>
+        </node>
+        <pkgManager>
+          <type>YARN</type>
+          <version>${yarn.version}</version>
+        </pkgManager>
+        <failOnMissingPackageJson>false</failOnMissingPackageJson>
+      </configuration>
+    </plugin>
 
     </plugins>
   </build>
 
   <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-
-          <plugin>
-            <groupId>sonia.maven</groupId>
-            <artifactId>web-compressor</artifactId>
-            <version>1.4</version>
-            <executions>
-              <execution>
-                <phase>compile</phase>
-                <goals>
-                  <goal>compress-directory</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <replace>true</replace>
-              <baseDirectory>${project.build.directory}/classes</baseDirectory>
-            </configuration>
-          </plugin>
-
-        </plugins>
-      </build>
-    </profile>
-
     <profile>
       <id>doc</id>
 
diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json
index 8f0ab90d34..602d6d2ff0 100644
--- a/scm-plugins/scm-git-plugin/package.json
+++ b/scm-plugins/scm-git-plugin/package.json
@@ -3,12 +3,15 @@
   "license" : "BSD-3-Clause",
   "main": "src/main/js/index.js",
   "scripts": {
-    "build": "ui-bundler plugin"
+    "build": "ui-bundler plugin",
+    "watch": "ui-bundler plugin -w",
+    "lint": "ui-bundler lint",
+    "flow": "flow check"
   },
   "dependencies": {
     "@scm-manager/ui-extensions": "^0.0.7"
   },
   "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.17"
+    "@scm-manager/ui-bundler": "^0.0.19"
   }
 }
diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml
index 11e2a40bd0..bf8769daca 100644
--- a/scm-plugins/scm-git-plugin/pom.xml
+++ b/scm-plugins/scm-git-plugin/pom.xml
@@ -43,11 +43,20 @@
 
   </dependencies>
 
-  <!-- create test jar -->
-
   <build>
     <plugins>
 
+      <plugin>
+        <groupId>sonia.scm.maven</groupId>
+        <artifactId>smp-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <corePlugin>true</corePlugin>
+        </configuration>
+      </plugin>
+
+      <!-- create test jar -->
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -61,33 +70,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>com.github.sdorra</groupId>
-        <artifactId>buildfrontend-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>link-ui-types</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>install-link</goal>
-            </goals>
-            <configuration>
-              <pkg>@scm-manager/ui-types</pkg>
-            </configuration>
-          </execution>
-          <execution>
-            <id>link-ui-components</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>install-link</goal>
-            </goals>
-            <configuration>
-              <pkg>@scm-manager/ui-components</pkg>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
     </plugins>
   </build>
 
diff --git a/scm-plugins/scm-git-plugin/yarn.lock b/scm-plugins/scm-git-plugin/yarn.lock
index c1abfd6640..b85f672a8e 100644
--- a/scm-plugins/scm-git-plugin/yarn.lock
+++ b/scm-plugins/scm-git-plugin/yarn.lock
@@ -707,9 +707,9 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
 
-"@scm-manager/ui-bundler@^0.0.17":
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.17.tgz#949b90ca57e4268be28fcf4975bd9622f60278bb"
+"@scm-manager/ui-bundler@^0.0.19":
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.19.tgz#646ab1fa1e5389fad614542215c60678fb9816ae"
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json
index a2ebd0e6ad..1398432412 100644
--- a/scm-plugins/scm-hg-plugin/package.json
+++ b/scm-plugins/scm-hg-plugin/package.json
@@ -9,6 +9,6 @@
     "@scm-manager/ui-extensions": "^0.0.7"
   },
   "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.17"
+    "@scm-manager/ui-bundler": "^0.0.19"
   }
 }
diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml
index 3da97d09e8..8dcc653642 100644
--- a/scm-plugins/scm-hg-plugin/pom.xml
+++ b/scm-plugins/scm-hg-plugin/pom.xml
@@ -31,8 +31,6 @@
 
   </dependencies>
   
-  <!-- create test jar -->
-  
   <build>
     <plugins>
       
@@ -54,7 +52,18 @@
           <strictCheck>true</strictCheck>
         </configuration>
       </plugin>
-        
+
+      <plugin>
+        <groupId>sonia.scm.maven</groupId>
+        <artifactId>smp-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <corePlugin>true</corePlugin>
+        </configuration>
+      </plugin>
+
+      <!-- create test jar -->
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -68,33 +77,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>com.github.sdorra</groupId>
-        <artifactId>buildfrontend-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>link-ui-types</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>install-link</goal>
-            </goals>
-            <configuration>
-              <pkg>@scm-manager/ui-types</pkg>
-            </configuration>
-          </execution>
-          <execution>
-            <id>link-ui-components</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>install-link</goal>
-            </goals>
-            <configuration>
-              <pkg>@scm-manager/ui-components</pkg>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
 
     </plugins>
   </build>
diff --git a/scm-plugins/scm-hg-plugin/yarn.lock b/scm-plugins/scm-hg-plugin/yarn.lock
index c3e8cc476f..70d4169198 100644
--- a/scm-plugins/scm-hg-plugin/yarn.lock
+++ b/scm-plugins/scm-hg-plugin/yarn.lock
@@ -641,9 +641,9 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
 
-"@scm-manager/ui-bundler@^0.0.17":
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.17.tgz#949b90ca57e4268be28fcf4975bd9622f60278bb"
+"@scm-manager/ui-bundler@^0.0.19":
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.19.tgz#646ab1fa1e5389fad614542215c60678fb9816ae"
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
@@ -660,6 +660,7 @@
     browserify-css "^0.14.0"
     colors "^1.3.1"
     commander "^2.17.1"
+    connect-history-api-fallback "^1.5.0"
     eslint "^5.4.0"
     eslint-config-react-app "^2.1.0"
     eslint-plugin-flowtype "^2.50.0"
diff --git a/scm-plugins/scm-legacy-plugin/pom.xml b/scm-plugins/scm-legacy-plugin/pom.xml
index 31d8422fbf..52aff51dd2 100644
--- a/scm-plugins/scm-legacy-plugin/pom.xml
+++ b/scm-plugins/scm-legacy-plugin/pom.xml
@@ -23,4 +23,19 @@
     </dependency>
     
   </dependencies>
-</project>
\ No newline at end of file
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>sonia.scm.maven</groupId>
+        <artifactId>smp-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <corePlugin>true</corePlugin>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+</project>
diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json
index b05332e6ca..1798c0b2e5 100644
--- a/scm-plugins/scm-svn-plugin/package.json
+++ b/scm-plugins/scm-svn-plugin/package.json
@@ -9,6 +9,6 @@
     "@scm-manager/ui-extensions": "^0.0.7"
   },
   "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.17"
+    "@scm-manager/ui-bundler": "^0.0.19"
   }
 }
diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml
index 6d99ff713c..395def8c27 100644
--- a/scm-plugins/scm-svn-plugin/pom.xml
+++ b/scm-plugins/scm-svn-plugin/pom.xml
@@ -37,11 +37,19 @@
 
   </dependencies>
   
-  <!-- create test jar -->
-  
   <build>
     <plugins>
-        
+
+      <plugin>
+        <groupId>sonia.scm.maven</groupId>
+        <artifactId>smp-maven-plugin</artifactId>
+        <configuration>
+          <corePlugin>true</corePlugin>
+        </configuration>
+      </plugin>
+
+      <!-- create test jar -->
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -55,34 +63,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>com.github.sdorra</groupId>
-        <artifactId>buildfrontend-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>link-ui-types</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>install-link</goal>
-            </goals>
-            <configuration>
-              <pkg>@scm-manager/ui-types</pkg>
-            </configuration>
-          </execution>
-          <execution>
-            <id>link-ui-components</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>install-link</goal>
-            </goals>
-            <configuration>
-              <pkg>@scm-manager/ui-components</pkg>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-
     </plugins>
   </build>
 
diff --git a/scm-plugins/scm-svn-plugin/yarn.lock b/scm-plugins/scm-svn-plugin/yarn.lock
index c3e8cc476f..977d642f6f 100644
--- a/scm-plugins/scm-svn-plugin/yarn.lock
+++ b/scm-plugins/scm-svn-plugin/yarn.lock
@@ -641,9 +641,9 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
 
-"@scm-manager/ui-bundler@^0.0.17":
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.17.tgz#949b90ca57e4268be28fcf4975bd9622f60278bb"
+"@scm-manager/ui-bundler@^0.0.19":
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.19.tgz#646ab1fa1e5389fad614542215c60678fb9816ae"
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
diff --git a/scm-ui-components/packages/ui-components/package.json b/scm-ui-components/packages/ui-components/package.json
index 096a8636b3..3d52d16173 100644
--- a/scm-ui-components/packages/ui-components/package.json
+++ b/scm-ui-components/packages/ui-components/package.json
@@ -12,7 +12,7 @@
     "eslint-fix": "eslint src --fix"
   },
   "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.17",
+    "@scm-manager/ui-bundler": "^0.0.19",
     "create-index": "^2.3.0",
     "enzyme": "^3.5.0",
     "enzyme-adapter-react-16": "^1.3.1",
diff --git a/scm-ui-components/packages/ui-components/yarn.lock b/scm-ui-components/packages/ui-components/yarn.lock
index b4b0cc32a8..0200fdd1bf 100644
--- a/scm-ui-components/packages/ui-components/yarn.lock
+++ b/scm-ui-components/packages/ui-components/yarn.lock
@@ -641,9 +641,9 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
 
-"@scm-manager/ui-bundler@^0.0.17":
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.17.tgz#949b90ca57e4268be28fcf4975bd9622f60278bb"
+"@scm-manager/ui-bundler@^0.0.19":
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.19.tgz#646ab1fa1e5389fad614542215c60678fb9816ae"
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
diff --git a/scm-ui-components/packages/ui-types/package.json b/scm-ui-components/packages/ui-types/package.json
index 0701870562..122b1ba504 100644
--- a/scm-ui-components/packages/ui-types/package.json
+++ b/scm-ui-components/packages/ui-types/package.json
@@ -14,7 +14,7 @@
     "check": "flow check"
   },
   "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.17"
+    "@scm-manager/ui-bundler": "^0.0.19"
   },
   "browserify": {
     "transform": [
diff --git a/scm-ui-components/packages/ui-types/yarn.lock b/scm-ui-components/packages/ui-types/yarn.lock
index 58b579d6ae..4f7257e8bb 100644
--- a/scm-ui-components/packages/ui-types/yarn.lock
+++ b/scm-ui-components/packages/ui-types/yarn.lock
@@ -707,9 +707,9 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
 
-"@scm-manager/ui-bundler@^0.0.17":
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.17.tgz#949b90ca57e4268be28fcf4975bd9622f60278bb"
+"@scm-manager/ui-bundler@^0.0.19":
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.19.tgz#646ab1fa1e5389fad614542215c60678fb9816ae"
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
diff --git a/scm-ui/package.json b/scm-ui/package.json
index de42ff2a36..e21c2e4739 100644
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -43,7 +43,7 @@
     "pre-commit": "jest && flow && eslint src"
   },
   "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.17",
+    "@scm-manager/ui-bundler": "^0.0.19",
     "copyfiles": "^2.0.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
diff --git a/scm-ui/yarn.lock b/scm-ui/yarn.lock
index 18b198622c..5e0fff1bd4 100644
--- a/scm-ui/yarn.lock
+++ b/scm-ui/yarn.lock
@@ -645,9 +645,9 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
 
-"@scm-manager/ui-bundler@^0.0.17":
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.17.tgz#949b90ca57e4268be28fcf4975bd9622f60278bb"
+"@scm-manager/ui-bundler@^0.0.19":
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.19.tgz#646ab1fa1e5389fad614542215c60678fb9816ae"
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"

From 40559dab8b04ce55027e3ed9241131ce91e49840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 29 Oct 2018 16:45:32 +0100
Subject: [PATCH 061/188] refactoring regarding design

---
 .../src/repos/sources/containers/Content.js   | 62 +++++++++++++------
 1 file changed, 43 insertions(+), 19 deletions(-)

diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index 4a66eb3670..72964f1952 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -16,6 +16,7 @@ import DownloadViewer from "../components/content/DownloadViewer";
 import FileSize from "../components/FileSize";
 import injectSheet from "react-jss";
 import classNames from "classnames";
+import RepositoryEntry from "../../components/list/RepositoryEntry";
 
 type Props = {
   t: string => string,
@@ -36,12 +37,16 @@ type State = {
   language: string,
   error: Error,
   hasError: boolean,
-  loaded: boolean
+  loaded: boolean,
+  collapsed: boolean
 };
 
 const styles = {
   toCenterContent: {
     display: "block"
+  },
+  pointer: {
+    cursor: "pointer"
   }
 };
 
@@ -54,7 +59,8 @@ class Content extends React.Component<Props, State> {
       language: "",
       error: new Error(),
       hasError: false,
-      loaded: false
+      loaded: false,
+      collapsed: false
     };
   }
 
@@ -81,8 +87,15 @@ class Content extends React.Component<Props, State> {
       .catch(err => {});
   }
 
+  toggleCollapse = () => {
+    this.setState(prevState => ({
+      collapsed: !prevState.collapsed
+    }));
+  };
+
   showHeader() {
-    const { file, revision } = this.props;
+    const { file, revision, classes } = this.props;
+    const collapsed = this.state.collapsed;
     const date = <DateFromNow date={file.lastModified} />;
     const description = file.description ? (
       <p>
@@ -97,23 +110,36 @@ class Content extends React.Component<Props, State> {
       </p>
     ) : null;
     const branch = "[" + revision + "]";
+    const icon = collapsed ? "fa-angle-right" : "fa-angle-down";
 
     return (
-      <div className="content">
-        <div className="columns">
-          <div className="column is-narrow">
-            <h4>{file.name}</h4>
-          </div>
-          <div className="column">{branch}</div>
-        </div>
+      <span className={classes.pointer} onClick={this.toggleCollapse}>
         <article className="media">
-          <div className="media-content">{description}</div>
-          <div className="media-right">{date}</div>
+          <div className="media-left">
+            <i className={classNames("fa", icon)} />
+          </div>
+          <div className="media-content">
+            <div className="content">{file.name}</div>
+          </div>
+          <div className="media-right">{date} + Size</div>
         </article>
-      </div>
+      </span>
     );
   }
 
+  showMoreInformation() {
+    const collapsed = this.state.collapsed;
+    const { classes } = this.props;
+    if (!collapsed) {
+      return (
+        <div className={classNames("panel-block", classes.toCenterContent)}>
+          "Filename": ... "Path": ... "Branch" ...
+        </div>
+      );
+    }
+    return null;
+  }
+
   showContent() {
     const { file } = this.props;
     const contentType = this.state.contentType;
@@ -121,7 +147,7 @@ class Content extends React.Component<Props, State> {
     if (contentType.startsWith("image/")) {
       return <ImageViewer file={file} />;
     } else if (language) {
-      return <SourcecodeViewer file={file} language={language}/>;
+      return <SourcecodeViewer file={file} language={language} />;
     } else {
       return <DownloadViewer file={file} />;
     }
@@ -142,16 +168,14 @@ class Content extends React.Component<Props, State> {
 
     const header = this.showHeader();
     const content = this.showContent();
+    const moreInformation = this.showMoreInformation();
     const fileSize = file.directory ? "" : <FileSize bytes={file.length} />;
 
     return (
       <div>
-        {header}
         <nav className="panel">
-          <article className="panel-heading media">
-            <div className="media-content">{file.name}</div>
-            <div className="media-right">{fileSize}</div>
-          </article>
+          <article className="panel-heading">{header}</article>
+          {moreInformation}
           <div className={classNames("panel-block", classes.toCenterContent)}>
             {content}
           </div>

From 54af2104d6ea4a6343c3bdd082e9906e595130a7 Mon Sep 17 00:00:00 2001
From: Mohamed Karray <mohamed.karray.sr@gmail.com>
Date: Mon, 29 Oct 2018 16:55:53 +0100
Subject: [PATCH 062/188] flexible getting of a unique hg changeset

---
 .../scm/api/v2/resources/ChangesetRootResource.java  | 12 ++++++++----
 .../api/v2/resources/ChangesetRootResourceTest.java  |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java
index 8900183f5b..57c0bb8712 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java
@@ -12,7 +12,6 @@ import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.repository.RevisionNotFoundException;
-import sonia.scm.repository.api.LogCommandBuilder;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.web.VndMediaType;
@@ -26,6 +25,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
+import java.util.Optional;
 
 
 @Slf4j
@@ -89,7 +89,7 @@ public class ChangesetRootResource {
   @Produces(VndMediaType.CHANGESET)
   @TypeHint(ChangesetDto.class)
   @Path("{id}")
-  public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("id") String id) throws IOException, RevisionNotFoundException, RepositoryNotFoundException {
+  public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("id") String id) throws IOException {
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
       Repository repository = repositoryService.getRepository();
       RepositoryPermissions.read(repository).check();
@@ -97,8 +97,12 @@ public class ChangesetRootResource {
         .setStartChangeset(id)
         .setEndChangeset(id)
         .getChangesets();
-      if (changesets != null && changesets.getChangesets() != null && changesets.getChangesets().size() == 1) {
-        return Response.ok(changesetToChangesetDtoMapper.map(changesets.getChangesets().get(0), repository)).build();
+      if (changesets != null && changesets.getChangesets() != null && !changesets.getChangesets().isEmpty()) {
+        Optional<Changeset> changeset = changesets.getChangesets().stream().filter(ch -> ch.getId().equals(id)).findFirst();
+        if (!changeset.isPresent()) {
+          return Response.status(Response.Status.NOT_FOUND).build();
+        }
+        return Response.ok(changesetToChangesetDtoMapper.map(changeset.get(), repository)).build();
       } else {
         return Response.status(Response.Status.NOT_FOUND).build();
       }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
index 4e1a0f90f1..c26998eef7 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
@@ -169,7 +169,7 @@ public class ChangesetRootResourceTest extends RepositoryTestBase {
     when(logCommandBuilder.setStartChangeset(anyString())).thenReturn(logCommandBuilder);
     when(logCommandBuilder.getChangesets()).thenReturn(changesetPagingResult);
     MockHttpRequest request = MockHttpRequest
-      .get(CHANGESET_URL + "id")
+      .get(CHANGESET_URL + id)
       .accept(VndMediaType.CHANGESET);
     MockHttpResponse response = new MockHttpResponse();
     dispatcher.invoke(request, response);

From e7f35b41feecc0aecefb90f779fbe1547a49bb09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 1 Nov 2018 08:31:26 +0100
Subject: [PATCH 063/188] correct tests

---
 scm-ui/src/repos/sources/containers/Content.js                | 1 -
 .../java/sonia/scm/api/v2/resources/ContentResourceTest.java  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index 72964f1952..2f55f63068 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -16,7 +16,6 @@ import DownloadViewer from "../components/content/DownloadViewer";
 import FileSize from "../components/FileSize";
 import injectSheet from "react-jss";
 import classNames from "classnames";
-import RepositoryEntry from "../../components/list/RepositoryEntry";
 
 type Props = {
   t: string => string,
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java
index 3d898119fb..e6a0972b78 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java
@@ -93,7 +93,7 @@ public class ContentResourceTest {
     Response response = contentResource.get(NAMESPACE, REPO_NAME, REV, "SomeGoCode.go");
     assertEquals(200, response.getStatus());
 
-    assertEquals("GO", response.getHeaderString("Language"));
+    assertEquals("GO", response.getHeaderString("X-Programming-Language"));
     assertEquals("text/x-go", response.getHeaderString("Content-Type"));
   }
 
@@ -104,7 +104,7 @@ public class ContentResourceTest {
     Response response = contentResource.get(NAMESPACE, REPO_NAME, REV, "Dockerfile");
     assertEquals(200, response.getStatus());
 
-    assertEquals("DOCKERFILE", response.getHeaderString("Language"));
+    assertEquals("DOCKERFILE", response.getHeaderString("X-Programming-Language"));
     assertEquals("text/plain", response.getHeaderString("Content-Type"));
   }
 

From 8db96afb8dc82aa171417dda2a85153f01015901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 1 Nov 2018 09:19:29 +0100
Subject: [PATCH 064/188] refactoring design

---
 .../src/repos/sources/containers/Content.js   | 70 ++++++++++++-------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index 2f55f63068..7eaaa51ad7 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -59,7 +59,7 @@ class Content extends React.Component<Props, State> {
       error: new Error(),
       hasError: false,
       loaded: false,
-      collapsed: false
+      collapsed: true
     };
   }
 
@@ -93,9 +93,32 @@ class Content extends React.Component<Props, State> {
   };
 
   showHeader() {
-    const { file, revision, classes } = this.props;
+    const { file, classes } = this.props;
     const collapsed = this.state.collapsed;
     const date = <DateFromNow date={file.lastModified} />;
+
+    const icon = collapsed ? "fa-angle-right" : "fa-angle-down";
+    const fileSize = file.directory ? "" : <FileSize bytes={file.length} />;
+
+    return (
+      <span className={classes.pointer} onClick={this.toggleCollapse}>
+        <article className="media">
+          <div className="media-left">
+            <i className={classNames("fa", icon)} />
+          </div>
+          <div className="media-content">
+            <div className="content">{file.name}</div>
+          </div>
+          <p className="media-right">{fileSize}</p>
+        </article>
+      </span>
+    );
+  }
+
+  showMoreInformation() {
+    const collapsed = this.state.collapsed;
+    const { classes, file, revision } = this.props;
+    const date = <DateFromNow date={file.lastModified} />;
     const description = file.description ? (
       <p>
         {file.description.split("\n").map((item, key) => {
@@ -108,31 +131,29 @@ class Content extends React.Component<Props, State> {
         })}
       </p>
     ) : null;
-    const branch = "[" + revision + "]";
-    const icon = collapsed ? "fa-angle-right" : "fa-angle-down";
-
-    return (
-      <span className={classes.pointer} onClick={this.toggleCollapse}>
-        <article className="media">
-          <div className="media-left">
-            <i className={classNames("fa", icon)} />
-          </div>
-          <div className="media-content">
-            <div className="content">{file.name}</div>
-          </div>
-          <div className="media-right">{date} + Size</div>
-        </article>
-      </span>
-    );
-  }
-
-  showMoreInformation() {
-    const collapsed = this.state.collapsed;
-    const { classes } = this.props;
     if (!collapsed) {
       return (
         <div className={classNames("panel-block", classes.toCenterContent)}>
-          "Filename": ... "Path": ... "Branch" ...
+          <table className="table">
+            <tbody>
+              <tr>
+                <th>Path</th>
+                <th>{file.path}</th>
+              </tr>
+              <tr>
+                <th>Branch</th>
+                <th>{revision}</th>
+              </tr>
+              <tr>
+                <th>Last modified</th>
+                <th>{date}</th>
+              </tr>
+              <tr>
+                <th>Description</th>
+                <th>{description}</th>
+              </tr>
+            </tbody>
+          </table>
         </div>
       );
     }
@@ -168,7 +189,6 @@ class Content extends React.Component<Props, State> {
     const header = this.showHeader();
     const content = this.showContent();
     const moreInformation = this.showMoreInformation();
-    const fileSize = file.directory ? "" : <FileSize bytes={file.length} />;
 
     return (
       <div>

From 0348eadcebaa95021a96d522c96780730bcd2761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 1 Nov 2018 09:50:58 +0100
Subject: [PATCH 065/188] add extension point

---
 scm-ui/src/repos/sources/containers/Content.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index 7eaaa51ad7..18336d39ad 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -16,6 +16,7 @@ import DownloadViewer from "../components/content/DownloadViewer";
 import FileSize from "../components/FileSize";
 import injectSheet from "react-jss";
 import classNames from "classnames";
+import { ExtensionPoint, binder } from "@scm-manager/ui-extensions";
 
 type Props = {
   t: string => string,
@@ -67,6 +68,7 @@ class Content extends React.Component<Props, State> {
     const { file } = this.props;
     getContentType(file._links.self.href)
       .then(result => {
+        console.log(result);
         if (result.error) {
           this.setState({
             ...this.state,
@@ -95,8 +97,6 @@ class Content extends React.Component<Props, State> {
   showHeader() {
     const { file, classes } = this.props;
     const collapsed = this.state.collapsed;
-    const date = <DateFromNow date={file.lastModified} />;
-
     const icon = collapsed ? "fa-angle-right" : "fa-angle-down";
     const fileSize = file.directory ? "" : <FileSize bytes={file.length} />;
 
@@ -161,7 +161,7 @@ class Content extends React.Component<Props, State> {
   }
 
   showContent() {
-    const { file } = this.props;
+    const { file, revision } = this.props;
     const contentType = this.state.contentType;
     const language = this.state.language;
     if (contentType.startsWith("image/")) {
@@ -169,7 +169,14 @@ class Content extends React.Component<Props, State> {
     } else if (language) {
       return <SourcecodeViewer file={file} language={language} />;
     } else {
-      return <DownloadViewer file={file} />;
+      return (
+        <ExtensionPoint
+          name="repos.sources.view"
+          props={{ file, contentType, revision }}
+        >
+          <DownloadViewer file={file} />
+        </ExtensionPoint>
+      );
     }
   }
 

From 0345154633e80a0a3f3b0527ada24681019482c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 1 Nov 2018 09:54:11 +0100
Subject: [PATCH 066/188] remov unused import

---
 scm-ui/src/repos/sources/containers/Content.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index 18336d39ad..b61cc9d2da 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -16,7 +16,7 @@ import DownloadViewer from "../components/content/DownloadViewer";
 import FileSize from "../components/FileSize";
 import injectSheet from "react-jss";
 import classNames from "classnames";
-import { ExtensionPoint, binder } from "@scm-manager/ui-extensions";
+import { ExtensionPoint } from "@scm-manager/ui-extensions";
 
 type Props = {
   t: string => string,
@@ -68,7 +68,6 @@ class Content extends React.Component<Props, State> {
     const { file } = this.props;
     getContentType(file._links.self.href)
       .then(result => {
-        console.log(result);
         if (result.error) {
           this.setState({
             ...this.state,

From fbd62e0fd53cf2ffe51ae5f676e574a54640c344 Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Thu, 1 Nov 2018 10:21:39 +0100
Subject: [PATCH 067/188] Verify that valid diff formats are accepted

---
 .../api/v2/resources/DiffRootResource.java    |  6 +++-
 .../api/v2/resources/DiffResourceTest.java    | 33 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
index 9687fef817..dbbad2c076 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
@@ -12,6 +12,7 @@ import sonia.scm.util.HttpUtil;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
+import javax.validation.constraints.Pattern;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -25,6 +26,9 @@ import javax.ws.rs.core.StreamingOutput;
 public class DiffRootResource {
 
   public static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition";
+
+  private static final String DIFF_FORMAT_VALUES_REGEX = "NATIVE|GIT|UNIFIED";
+
   private final RepositoryServiceFactory serviceFactory;
 
   @Inject
@@ -53,7 +57,7 @@ public class DiffRootResource {
     @ResponseCode(code = 404, condition = "not found, no revision with the specified param for the repository available or repository not found"),
     @ResponseCode(code = 500, condition = "internal server error")
   })
-  public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision , @DefaultValue("NATIVE") @QueryParam("format") String format ){
+  public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision , @Pattern(regexp = DIFF_FORMAT_VALUES_REGEX) @DefaultValue("NATIVE") @QueryParam("format") String format ){
     HttpUtil.checkForCRLFInjection(revision);
     DiffFormat diffFormat = DiffFormat.valueOf(format);
     try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
index dc0b838cf6..8c508be9fd 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
@@ -24,14 +24,17 @@ import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryNotFoundException;
 import sonia.scm.repository.RevisionNotFoundException;
 import sonia.scm.repository.api.DiffCommandBuilder;
+import sonia.scm.repository.api.DiffFormat;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.web.VndMediaType;
 
 import java.net.URISyntaxException;
+import java.util.Arrays;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
@@ -158,4 +161,34 @@ public class DiffResourceTest extends RepositoryTestBase {
     dispatcher.invoke(request, response);
     assertEquals(400, response.getStatus());
   }
+
+  @Test
+  public void shouldAcceptDiffFormats() throws Exception {
+    when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder);
+    when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder);
+    when(diffCommandBuilder.retriveContent(any())).thenReturn(diffCommandBuilder);
+
+    Arrays.stream(DiffFormat.values()).map(DiffFormat::name).forEach(
+      this::assertRequestOk
+    );
+  }
+
+  private void assertRequestOk(String format) {
+    MockHttpRequest request = null;
+    try {
+      request = MockHttpRequest
+        .get(DIFF_URL + "revision?format=" + format)
+        .accept(VndMediaType.DIFF);
+    } catch (URISyntaxException e) {
+      e.printStackTrace();
+      fail("got exception: " + e);
+    }
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertThat(response.getStatus())
+      .withFailMessage("diff format from DiffFormat enum must be accepted: " + format)
+      .isEqualTo(200);
+  }
 }

From 5ca3946c381bac8f1284026e55d9a4d0c743c79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 1 Nov 2018 10:23:08 +0100
Subject: [PATCH 068/188] fix tests

---
 .../src/repos/sources/containers/Content.js   | 20 ++-----------------
 .../repos/sources/containers/contentType.js   | 16 +++++++++++++++
 .../{Content.test.js => contentType.test.js}  |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 scm-ui/src/repos/sources/containers/contentType.js
 rename scm-ui/src/repos/sources/containers/{Content.test.js => contentType.test.js} (92%)

diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index b61cc9d2da..e63d9fc814 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -1,7 +1,6 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import { apiClient } from "@scm-manager/ui-components";
 import { getSources } from "../modules/sources";
 import type { Repository, File } from "@scm-manager/ui-types";
 import {
@@ -17,19 +16,17 @@ import FileSize from "../components/FileSize";
 import injectSheet from "react-jss";
 import classNames from "classnames";
 import { ExtensionPoint } from "@scm-manager/ui-extensions";
+import { getContentType } from "./contentType";
 
 type Props = {
-  t: string => string,
   loading: boolean,
   error: Error,
   file: File,
   repository: Repository,
   revision: string,
   path: string,
-  // context props
   classes: any,
-  t: string => string,
-  match: any
+  t: string => string
 };
 
 type State = {
@@ -210,19 +207,6 @@ class Content extends React.Component<Props, State> {
   }
 }
 
-export function getContentType(url: string, state: any) {
-  return apiClient
-    .head(url)
-    .then(response => {
-      return {
-        type: response.headers.get("Content-Type"),
-        language: response.headers.get("X-Programming-Language")
-      };
-    })
-    .catch(err => {
-      return { error: err };
-    });
-}
 
 const mapStateToProps = (state: any, ownProps: Props) => {
   const { repository, revision, path } = ownProps;
diff --git a/scm-ui/src/repos/sources/containers/contentType.js b/scm-ui/src/repos/sources/containers/contentType.js
new file mode 100644
index 0000000000..bf9888834b
--- /dev/null
+++ b/scm-ui/src/repos/sources/containers/contentType.js
@@ -0,0 +1,16 @@
+//@flow
+import { apiClient } from "@scm-manager/ui-components";
+
+export function getContentType(url: string) {
+  return apiClient
+    .head(url)
+    .then(response => {
+      return {
+        type: response.headers.get("Content-Type"),
+        language: response.headers.get("X-Programming-Language")
+      };
+    })
+    .catch(err => {
+      return { error: err };
+    });
+}
diff --git a/scm-ui/src/repos/sources/containers/Content.test.js b/scm-ui/src/repos/sources/containers/contentType.test.js
similarity index 92%
rename from scm-ui/src/repos/sources/containers/Content.test.js
rename to scm-ui/src/repos/sources/containers/contentType.test.js
index 36116b35aa..c3ab85ed80 100644
--- a/scm-ui/src/repos/sources/containers/Content.test.js
+++ b/scm-ui/src/repos/sources/containers/contentType.test.js
@@ -1,6 +1,6 @@
 //@flow
 import fetchMock from "fetch-mock";
-import { getContentType } from "./Content";
+import { getContentType } from "./contentType";
 
 describe("get content type", () => {
   const CONTENT_URL = "/repositories/scmadmin/TestRepo/content/testContent";

From c544b1f90c43f34c582900d210044754b9bc0835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 1 Nov 2018 10:33:35 +0100
Subject: [PATCH 069/188] make error in state optional

---
 scm-ui/src/repos/sources/containers/Content.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index e63d9fc814..3e6ce183cf 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -32,10 +32,9 @@ type Props = {
 type State = {
   contentType: string,
   language: string,
-  error: Error,
-  hasError: boolean,
   loaded: boolean,
-  collapsed: boolean
+  collapsed: boolean,
+  error?: Error,
 };
 
 const styles = {
@@ -54,8 +53,6 @@ class Content extends React.Component<Props, State> {
     this.state = {
       contentType: "",
       language: "",
-      error: new Error(),
-      hasError: false,
       loaded: false,
       collapsed: true
     };
@@ -68,7 +65,6 @@ class Content extends React.Component<Props, State> {
         if (result.error) {
           this.setState({
             ...this.state,
-            hasError: true,
             error: result.error,
             loaded: true
           });
@@ -179,13 +175,12 @@ class Content extends React.Component<Props, State> {
   render() {
     const { file, classes } = this.props;
     const error = this.state.error;
-    const hasError = this.state.hasError;
     const loaded = this.state.loaded;
 
     if (!file || !loaded) {
       return <Loading />;
     }
-    if (hasError) {
+    if (error) {
       return <ErrorNotification error={error} />;
     }
 

From 4f30644e7db2458d1b271cb1603ea45d18a1c3f9 Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Thu, 1 Nov 2018 10:35:51 +0100
Subject: [PATCH 070/188] Use cache with size zero to avoid null checks

---
 .../scm/plugin/DefaultUberWebResourceLoader.java    | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultUberWebResourceLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultUberWebResourceLoader.java
index 6b886dd5ce..25b8390e53 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultUberWebResourceLoader.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultUberWebResourceLoader.java
@@ -81,9 +81,9 @@ public class DefaultUberWebResourceLoader implements UberWebResourceLoader
     this.cache = createCache(stage);
   }
 
-  private final Cache<String, URL> createCache(Stage stage) {
+  private Cache<String, URL> createCache(Stage stage) {
     if (stage == Stage.DEVELOPMENT) {
-      return null;
+      return CacheBuilder.newBuilder().maximumSize(0).build(); // Disable caching
     }
     return CacheBuilder.newBuilder().build();
   }
@@ -121,16 +121,11 @@ public class DefaultUberWebResourceLoader implements UberWebResourceLoader
   }
 
   private URL getFromCache(String path) {
-    if (cache != null) {
-      return cache.getIfPresent(path);
-    }
-    return null;
+    return cache.getIfPresent(path);
   }
 
   private void addToCache(String path, URL url) {
-    if (cache != null) {
-      cache.put(path, url);
-    }
+    cache.put(path, url);
   }
 
   /**

From fba2bc2e80fcea1d1eb88844cf4affc17127cf08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 1 Nov 2018 10:58:47 +0100
Subject: [PATCH 071/188] show text if source is text

---
 .../src/repos/sources/containers/Content.js   | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js
index 3e6ce183cf..0b764aa6a1 100644
--- a/scm-ui/src/repos/sources/containers/Content.js
+++ b/scm-ui/src/repos/sources/containers/Content.js
@@ -34,7 +34,7 @@ type State = {
   language: string,
   loaded: boolean,
   collapsed: boolean,
-  error?: Error,
+  error?: Error
 };
 
 const styles = {
@@ -129,20 +129,20 @@ class Content extends React.Component<Props, State> {
           <table className="table">
             <tbody>
               <tr>
-                <th>Path</th>
-                <th>{file.path}</th>
+                <td>Path</td>
+                <td>{file.path}</td>
               </tr>
               <tr>
-                <th>Branch</th>
-                <th>{revision}</th>
+                <td>Branch</td>
+                <td>{revision}</td>
               </tr>
               <tr>
-                <th>Last modified</th>
-                <th>{date}</th>
+                <td>Last modified</td>
+                <td>{date}</td>
               </tr>
               <tr>
-                <th>Description</th>
-                <th>{description}</th>
+                <td>Description</td>
+                <td>{description}</td>
               </tr>
             </tbody>
           </table>
@@ -154,12 +154,13 @@ class Content extends React.Component<Props, State> {
 
   showContent() {
     const { file, revision } = this.props;
-    const contentType = this.state.contentType;
-    const language = this.state.language;
+    const { contentType, language } = this.state;
     if (contentType.startsWith("image/")) {
       return <ImageViewer file={file} />;
     } else if (language) {
       return <SourcecodeViewer file={file} language={language} />;
+    } else if (contentType.startsWith("text/")) {
+      return <SourcecodeViewer file={file} language="none" />;
     } else {
       return (
         <ExtensionPoint
@@ -174,8 +175,7 @@ class Content extends React.Component<Props, State> {
 
   render() {
     const { file, classes } = this.props;
-    const error = this.state.error;
-    const loaded = this.state.loaded;
+    const { loaded, error } = this.state;
 
     if (!file || !loaded) {
       return <Loading />;
@@ -202,7 +202,6 @@ class Content extends React.Component<Props, State> {
   }
 }
 
-
 const mapStateToProps = (state: any, ownProps: Props) => {
   const { repository, revision, path } = ownProps;
 

From e1f8f13550a31286e2ca9f26c459dc78301e85ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 1 Nov 2018 10:59:04 +0100
Subject: [PATCH 072/188] make error optional in state

---
 .../sources/components/content/SourcecodeViewer.js  | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
index c19338e639..e54f8e1b3b 100644
--- a/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
+++ b/scm-ui/src/repos/sources/components/content/SourcecodeViewer.js
@@ -15,8 +15,7 @@ type Props = {
 
 type State = {
   content: string,
-  error: Error,
-  hasError: boolean,
+  error?: Error,
   loaded: boolean
 };
 
@@ -26,8 +25,6 @@ class SourcecodeViewer extends React.Component<Props, State> {
 
     this.state = {
       content: "",
-      error: new Error(),
-      hasError: false,
       loaded: false
     };
   }
@@ -39,7 +36,6 @@ class SourcecodeViewer extends React.Component<Props, State> {
         if (result.error) {
           this.setState({
             ...this.state,
-            hasError: true,
             error: result.error,
             loaded: true
           });
@@ -55,13 +51,10 @@ class SourcecodeViewer extends React.Component<Props, State> {
   }
 
   render() {
-    const content = this.state.content;
-    const error = this.state.error;
-    const hasError = this.state.hasError;
-    const loaded = this.state.loaded;
+    const { content, error, loaded } = this.state;
     const language = this.props.language;
 
-    if (hasError) {
+    if (error) {
       return <ErrorNotification error={error} />;
     }
 

From c771f74d7192145455d72b51799d79b597888885 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 1 Nov 2018 10:03:23 +0000
Subject: [PATCH 073/188] Close branch feature/ui-repoContent


From ab2a622ac60931a51104e483edeab7e155282eda Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Thu, 1 Nov 2018 11:09:42 +0100
Subject: [PATCH 074/188] Fix list items

---
 .../scm/repository/spi/SCMSvnDiffGenerator.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
index b21f0d091b..70615698b8 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
@@ -51,15 +51,16 @@ import java.util.TreeMap;
  *
  * The folowing modifications are applied when using the git format
  * <ul>
- *     <il>
+ *     <li>
  *         remove the svn header
- *     </il>
- *     <il>
- *         use the git diff code 100644 on the new file and deleted file actions
- *     </il>
- *     <il>
- *         remove the labels in the added and deleted file headers eg. [+++ a/a.txt (revision 4)] will replaced with [+++ a/a.txt]
- *     </il>
+ *     </li>
+ *     <li>
+ *         use the git diff code 100644 on new file and deleted file actions
+ *     </li>
+ *     <li>
+ *         remove the labels in the added and deleted file headers, eg. <code>[+++ a/a.txt (revision 4)]</code> is
+ *         replaced with <code>[+++ a/a.txt]</code>
+ *     </li>
  * </ul>
  */
 @SuppressWarnings("all")

From f505fcdbb9db9bf3ac4bc2abc6969d1b05a3bdd7 Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Thu, 1 Nov 2018 11:16:18 +0100
Subject: [PATCH 075/188] Remove .java suffix from test file names

Otherwise searching for the original class may present you multiple
results
---
 scm-it/src/test/java/sonia/scm/it/DiffITCase.java           | 6 +++---
 ...nDiffGenerator_forTest.java => SvnDiffGenerator_forTest} | 0
 ...nDiffGenerator_forTest.java => SvnDiffGenerator_forTest} | 0
 ...nDiffGenerator_forTest.java => SvnDiffGenerator_forTest} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename scm-it/src/test/resources/diff/largefile/modified/v1/{SvnDiffGenerator_forTest.java => SvnDiffGenerator_forTest} (100%)
 rename scm-it/src/test/resources/diff/largefile/modified/v2/{SvnDiffGenerator_forTest.java => SvnDiffGenerator_forTest} (100%)
 rename scm-it/src/test/resources/diff/largefile/original/{SvnDiffGenerator_forTest.java => SvnDiffGenerator_forTest} (100%)

diff --git a/scm-it/src/test/java/sonia/scm/it/DiffITCase.java b/scm-it/src/test/java/sonia/scm/it/DiffITCase.java
index bf104ac852..6027652161 100644
--- a/scm-it/src/test/java/sonia/scm/it/DiffITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/DiffITCase.java
@@ -154,7 +154,7 @@ public class DiffITCase {
 
   @Test
   public void svnLargeChangesDiffShouldBeConvertedToGitDiff() throws IOException, URISyntaxException {
-    String fileName = "SvnDiffGenerator_forTest.java";
+    String fileName = "SvnDiffGenerator_forTest";
     RepositoryUtil.createAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, "");
     RepositoryUtil.createAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, "");
 
@@ -164,13 +164,13 @@ public class DiffITCase {
     assertThat(svnDiff)
       .isEqualTo(getGitDiffWithoutIndexLine(gitDiff));
 
-    fileContent = getFileContent("/diff/largefile/modified/v1/SvnDiffGenerator_forTest.java");
+    fileContent = getFileContent("/diff/largefile/modified/v1/SvnDiffGenerator_forTest");
     svnDiff = getDiff(RepositoryUtil.updateAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, fileContent), svnRepositoryResponse);
     gitDiff = getDiff(RepositoryUtil.updateAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, fileContent), gitRepositoryResponse);
     assertThat(svnDiff)
       .isEqualTo(getGitDiffWithoutIndexLine(gitDiff));
 
-    fileContent = getFileContent("/diff/largefile/modified/v2/SvnDiffGenerator_forTest.java");
+    fileContent = getFileContent("/diff/largefile/modified/v2/SvnDiffGenerator_forTest");
     svnDiff = getDiff(RepositoryUtil.updateAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, fileContent), svnRepositoryResponse);
     gitDiff = getDiff(RepositoryUtil.updateAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, fileContent), gitRepositoryResponse);
     assertThat(svnDiff)
diff --git a/scm-it/src/test/resources/diff/largefile/modified/v1/SvnDiffGenerator_forTest.java b/scm-it/src/test/resources/diff/largefile/modified/v1/SvnDiffGenerator_forTest
similarity index 100%
rename from scm-it/src/test/resources/diff/largefile/modified/v1/SvnDiffGenerator_forTest.java
rename to scm-it/src/test/resources/diff/largefile/modified/v1/SvnDiffGenerator_forTest
diff --git a/scm-it/src/test/resources/diff/largefile/modified/v2/SvnDiffGenerator_forTest.java b/scm-it/src/test/resources/diff/largefile/modified/v2/SvnDiffGenerator_forTest
similarity index 100%
rename from scm-it/src/test/resources/diff/largefile/modified/v2/SvnDiffGenerator_forTest.java
rename to scm-it/src/test/resources/diff/largefile/modified/v2/SvnDiffGenerator_forTest
diff --git a/scm-it/src/test/resources/diff/largefile/original/SvnDiffGenerator_forTest.java b/scm-it/src/test/resources/diff/largefile/original/SvnDiffGenerator_forTest
similarity index 100%
rename from scm-it/src/test/resources/diff/largefile/original/SvnDiffGenerator_forTest.java
rename to scm-it/src/test/resources/diff/largefile/original/SvnDiffGenerator_forTest

From 59fccdb0f0c21924ca730bcb4e4db305b667a478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 1 Nov 2018 10:40:53 +0000
Subject: [PATCH 076/188] Close branch feature/lr-for-plugins


From 927920cb9737fd52c3829b5d8613cc620d1f627d Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Thu, 1 Nov 2018 11:43:49 +0100
Subject: [PATCH 077/188] Fix imports

---
 .../components/changesets/ChangesetDetails.js | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/scm-ui/src/repos/components/changesets/ChangesetDetails.js b/scm-ui/src/repos/components/changesets/ChangesetDetails.js
index 87b18a0ae1..14f48362b8 100644
--- a/scm-ui/src/repos/components/changesets/ChangesetDetails.js
+++ b/scm-ui/src/repos/components/changesets/ChangesetDetails.js
@@ -1,17 +1,17 @@
 //@flow
 import React from "react";
-import type {Changeset, Repository} from "../../../../../scm-ui-components/packages/ui-types/src/index";
-import {Interpolate, translate} from "react-i18next";
+import type { Changeset, Repository } from "@scm-manager/ui-types";
+import { Interpolate, translate } from "react-i18next";
 import injectSheet from "react-jss";
 import ChangesetTag from "./ChangesetTag";
 import ChangesetAuthor from "./ChangesetAuthor";
-import {parseDescription} from "./changesets";
-import {DateFromNow} from "../../../../../scm-ui-components/packages/ui-components/src/index";
+import { parseDescription } from "./changesets";
+import { DateFromNow } from "@scm-manager/ui-components";
 import AvatarWrapper from "./AvatarWrapper";
 import AvatarImage from "./AvatarImage";
 import classNames from "classnames";
 import ChangesetId from "./ChangesetId";
-import type {Tag} from "@scm-manager/ui-types";
+import type { Tag } from "@scm-manager/ui-types";
 import ScmDiff from "../../containers/ScmDiff";
 
 const styles = {
@@ -29,14 +29,14 @@ type Props = {
 
 class ChangesetDetails extends React.Component<Props> {
   render() {
-    const {changeset, repository, classes} = this.props;
+    const { changeset, repository, classes } = this.props;
 
     const description = parseDescription(changeset.description);
 
     const id = (
-      <ChangesetId repository={repository} changeset={changeset} link={false}/>
+      <ChangesetId repository={repository} changeset={changeset} link={false} />
     );
-    const date = <DateFromNow date={changeset.date}/>;
+    const date = <DateFromNow date={changeset.date} />;
 
     return (
       <div>
@@ -45,12 +45,12 @@ class ChangesetDetails extends React.Component<Props> {
           <article className="media">
             <AvatarWrapper>
               <p className={classNames("image", "is-64x64", classes.spacing)}>
-                <AvatarImage changeset={changeset}/>
+                <AvatarImage changeset={changeset} />
               </p>
             </AvatarWrapper>
             <div className="media-content">
               <p>
-                <ChangesetAuthor changeset={changeset}/>
+                <ChangesetAuthor changeset={changeset} />
               </p>
               <p>
                 <Interpolate
@@ -66,22 +66,22 @@ class ChangesetDetails extends React.Component<Props> {
             {description.message.split("\n").map((item, key) => {
               return (
                 <span key={key}>
-                {item}
-                  <br/>
-              </span>
+                  {item}
+                  <br />
+                </span>
               );
             })}
           </p>
         </div>
         <div>
-          <ScmDiff changeset={changeset} sideBySide={false}/>
+          <ScmDiff changeset={changeset} sideBySide={false} />
         </div>
       </div>
     );
   }
 
   getTags = () => {
-    const {changeset} = this.props;
+    const { changeset } = this.props;
     return changeset._embedded.tags || [];
   };
 
@@ -91,7 +91,7 @@ class ChangesetDetails extends React.Component<Props> {
       return (
         <div className="level-item">
           {tags.map((tag: Tag) => {
-            return <ChangesetTag key={tag.name} tag={tag}/>;
+            return <ChangesetTag key={tag.name} tag={tag} />;
           })}
         </div>
       );

From 1bfc4e7322d074a89839fcb3d4dc50c8d2c1e15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 1 Nov 2018 11:10:15 +0000
Subject: [PATCH 078/188] Close branch feature/ui_diff


From ef23178fad84915853bebe3e5a03d8e6cb16376b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 1 Nov 2018 13:06:14 +0100
Subject: [PATCH 079/188] Fix test file name

---
 scm-it/src/test/java/sonia/scm/it/DiffITCase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scm-it/src/test/java/sonia/scm/it/DiffITCase.java b/scm-it/src/test/java/sonia/scm/it/DiffITCase.java
index 6027652161..acd2816422 100644
--- a/scm-it/src/test/java/sonia/scm/it/DiffITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/DiffITCase.java
@@ -158,7 +158,7 @@ public class DiffITCase {
     RepositoryUtil.createAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, "");
     RepositoryUtil.createAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, "");
 
-    String fileContent = getFileContent("/diff/largefile/original/SvnDiffGenerator_forTest.java");
+    String fileContent = getFileContent("/diff/largefile/original/SvnDiffGenerator_forTest");
     String svnDiff = getDiff(RepositoryUtil.updateAndCommitFile(svnRepositoryClient, ADMIN_USERNAME, fileName, fileContent), svnRepositoryResponse);
     String gitDiff = getDiff(RepositoryUtil.updateAndCommitFile(gitRepositoryClient, ADMIN_USERNAME, fileName, fileContent), gitRepositoryResponse);
     assertThat(svnDiff)

From a1f16713ccf909aab2699e0e3ba2dbd840d54747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 2 Nov 2018 08:20:57 +0100
Subject: [PATCH 080/188] Remove unused constructor

---
 .../scm/NotSupportedFeatureException.java      | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/NotSupportedFeatureException.java b/scm-core/src/main/java/sonia/scm/NotSupportedFeatureException.java
index 2270ed37b3..0d18882675 100644
--- a/scm-core/src/main/java/sonia/scm/NotSupportedFeatureException.java
+++ b/scm-core/src/main/java/sonia/scm/NotSupportedFeatureException.java
@@ -38,26 +38,10 @@ package sonia.scm;
  * @author Sebastian Sdorra
  * @version 1.6
  */
-public class NotSupportedFeatureException extends Exception
-{
+public class NotSupportedFeatureException extends Exception {
 
-  /** Field description */
   private static final long serialVersionUID = 256498734456613496L;
 
-  //~--- constructors ---------------------------------------------------------
-
-  /**
-   * Constructs ...
-   *
-   */
-  public NotSupportedFeatureException() {}
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param message
-   */
   public NotSupportedFeatureException(String message)
   {
     super(message);

From 359a857ca3e31ad14c1c56b9c27d9f1adb545fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 2 Nov 2018 16:21:23 +0100
Subject: [PATCH 081/188] Migrate NotSupportedFeatureException

---
 .../scm/NotSupportedFeatureException.java     | 19 ++++++++++++++++---
 .../repository/AbstractRepositoryHandler.java |  3 +--
 .../NotSupportedFeatureExceptionMapper.java   | 15 +++++++++++++++
 .../scm/api/v2/resources/DispatcherMock.java  |  2 ++
 4 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/NotSupportedFeatureExceptionMapper.java

diff --git a/scm-core/src/main/java/sonia/scm/NotSupportedFeatureException.java b/scm-core/src/main/java/sonia/scm/NotSupportedFeatureException.java
index 0d18882675..daf996ee6c 100644
--- a/scm-core/src/main/java/sonia/scm/NotSupportedFeatureException.java
+++ b/scm-core/src/main/java/sonia/scm/NotSupportedFeatureException.java
@@ -33,17 +33,30 @@
 
 package sonia.scm;
 
+import java.util.Collections;
+
 /**
  *
  * @author Sebastian Sdorra
  * @version 1.6
  */
-public class NotSupportedFeatureException extends Exception {
+public class NotSupportedFeatureException extends ExceptionWithContext {
 
   private static final long serialVersionUID = 256498734456613496L;
 
-  public NotSupportedFeatureException(String message)
+  private static final String CODE = "9SR8G0kmU1";
+
+  public NotSupportedFeatureException(String feature)
   {
-    super(message);
+    super(Collections.emptyList(),createMessage(feature));
+  }
+
+  @Override
+  public String getCode() {
+    return CODE;
+  }
+
+  private static String createMessage(String feature) {
+    return "feature " + feature + " is not supported by this repository";
   }
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
index a545aefdc8..42c8f22a0f 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
@@ -170,8 +170,7 @@ public abstract class AbstractRepositoryHandler<C extends RepositoryConfig>
   @Override
   public ImportHandler getImportHandler() throws NotSupportedFeatureException
   {
-    throw new NotSupportedFeatureException(
-      "import handler is not supported by this repository handler");
+    throw new NotSupportedFeatureException("import");
   }
 
   /**
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/NotSupportedFeatureExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/NotSupportedFeatureExceptionMapper.java
new file mode 100644
index 0000000000..b2cba5b3d4
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/NotSupportedFeatureExceptionMapper.java
@@ -0,0 +1,15 @@
+package sonia.scm.api.v2;
+
+import sonia.scm.NotSupportedFeatureException;
+import sonia.scm.api.rest.ContextualExceptionMapper;
+import sonia.scm.api.v2.resources.ExceptionWithContextToErrorDtoMapper;
+
+import javax.inject.Inject;
+import javax.ws.rs.core.Response;
+
+public class NotSupportedFeatureExceptionMapper extends ContextualExceptionMapper<NotSupportedFeatureException> {
+  @Inject
+  public NotSupportedFeatureExceptionMapper(ExceptionWithContextToErrorDtoMapper mapper) {
+    super(NotSupportedFeatureException.class, Response.Status.BAD_REQUEST, mapper);
+  }
+}
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
index 4bda5c875d..c8609b0712 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
@@ -7,6 +7,7 @@ import sonia.scm.api.rest.AuthorizationExceptionMapper;
 import sonia.scm.api.rest.ConcurrentModificationExceptionMapper;
 import sonia.scm.api.rest.IllegalArgumentExceptionMapper;
 import sonia.scm.api.v2.NotFoundExceptionMapper;
+import sonia.scm.api.v2.NotSupportedFeatureExceptionMapper;
 
 public class DispatcherMock {
   public static Dispatcher createDispatcher(Object resource) {
@@ -21,6 +22,7 @@ public class DispatcherMock {
     dispatcher.getProviderFactory().register(new ChangePasswordNotAllowedExceptionMapper(mapper));
     dispatcher.getProviderFactory().register(new InvalidPasswordExceptionMapper(mapper));
     dispatcher.getProviderFactory().registerProvider(IllegalArgumentExceptionMapper.class);
+    dispatcher.getProviderFactory().register(new NotSupportedFeatureExceptionMapper(mapper));
     return dispatcher;
   }
 }

From ee88cea1ea9817715579f6432d8b02fc1ec2434c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 2 Nov 2018 17:12:11 +0100
Subject: [PATCH 082/188] Mark exception mapper as provider

---
 .../sonia/scm/api/v2/NotSupportedFeatureExceptionMapper.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/NotSupportedFeatureExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/NotSupportedFeatureExceptionMapper.java
index b2cba5b3d4..6a48663aa5 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/NotSupportedFeatureExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/NotSupportedFeatureExceptionMapper.java
@@ -6,7 +6,9 @@ import sonia.scm.api.v2.resources.ExceptionWithContextToErrorDtoMapper;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
 
+@Provider
 public class NotSupportedFeatureExceptionMapper extends ContextualExceptionMapper<NotSupportedFeatureException> {
   @Inject
   public NotSupportedFeatureExceptionMapper(ExceptionWithContextToErrorDtoMapper mapper) {

From 9a1878f3e8d99e218250ddbba6f081f57c5dcba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 2 Nov 2018 17:12:49 +0100
Subject: [PATCH 083/188] Add fallback exception mapper

---
 .../scm/api/FallbackExceptionMapper.java      | 43 +++++++++++++++++++
 .../api/rest/ContextualExceptionMapper.java   |  2 +-
 .../sonia/scm/api/v2/resources/ErrorDto.java  |  2 +-
 3 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/FallbackExceptionMapper.java

diff --git a/scm-webapp/src/main/java/sonia/scm/api/FallbackExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/FallbackExceptionMapper.java
new file mode 100644
index 0000000000..feb5341e2d
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/FallbackExceptionMapper.java
@@ -0,0 +1,43 @@
+package sonia.scm.api;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+import sonia.scm.api.v2.resources.ErrorDto;
+import sonia.scm.api.v2.resources.ExceptionWithContextToErrorDtoMapper;
+import sonia.scm.web.VndMediaType;
+
+import javax.inject.Inject;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+import java.util.Collections;
+
+@Provider
+public class FallbackExceptionMapper implements ExceptionMapper<Exception> {
+
+  private static final Logger logger = LoggerFactory.getLogger(FallbackExceptionMapper.class);
+
+  private static final String ERROR_CODE = "CmR8GCJb31";
+
+  private final ExceptionWithContextToErrorDtoMapper mapper;
+
+  @Inject
+  public FallbackExceptionMapper(ExceptionWithContextToErrorDtoMapper mapper) {
+    this.mapper = mapper;
+  }
+
+  @Override
+  public Response toResponse(Exception exception) {
+    logger.debug("map {} to status code 500", exception);
+    ErrorDto errorDto = new ErrorDto();
+    errorDto.setMessage("internal server error");
+    errorDto.setContext(Collections.emptyList());
+    errorDto.setErrorCode(ERROR_CODE);
+    errorDto.setTransactionId(MDC.get("transaction_id"));
+    return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+      .entity(errorDto)
+      .type(VndMediaType.ERROR_TYPE)
+      .build();
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
index 43b8a38ccc..d8ab4033d1 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
@@ -13,7 +13,7 @@ public class ContextualExceptionMapper<E extends ExceptionWithContext> implement
 
   private static final Logger logger = LoggerFactory.getLogger(ContextualExceptionMapper.class);
 
-  private ExceptionWithContextToErrorDtoMapper mapper;
+  private final ExceptionWithContextToErrorDtoMapper mapper;
 
   private final Response.Status status;
   private final Class<E> type;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
index f0df654866..bd889d5de5 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ErrorDto.java
@@ -17,7 +17,7 @@ public class ErrorDto {
   private List<ContextEntry> context;
   private String message;
 
-  @XmlElement(name = "violation")
+  @JsonInclude(JsonInclude.Include.NON_NULL)
   @XmlElementWrapper(name = "violations")
   private List<ConstraintViolationDto> violations;
 

From ff1dc25c5c4554b72cf8ce1d6977485d58cf66a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 13:14:52 +0100
Subject: [PATCH 084/188] fetch user again after modification

---
 scm-ui/src/users/containers/SingleUser.js | 10 +++---
 scm-ui/src/users/modules/users.js         | 15 +++++++--
 scm-ui/src/users/modules/users.test.js    | 41 +++++++++++++++++++----
 3 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js
index f581874742..ed5d6df0c3 100644
--- a/scm-ui/src/users/containers/SingleUser.js
+++ b/scm-ui/src/users/containers/SingleUser.js
@@ -15,7 +15,7 @@ import EditUser from "./EditUser";
 import type { User } from "@scm-manager/ui-types";
 import type { History } from "history";
 import {
-  fetchUser,
+  fetchUserByName,
   deleteUser,
   getUserByName,
   isFetchUserPending,
@@ -37,7 +37,7 @@ type Props = {
 
   // dispatcher functions
   deleteUser: (user: User, callback?: () => void) => void,
-  fetchUser: (string, string) => void,
+  fetchUserByName: (string, string) => void,
 
   // context objects
   t: string => string,
@@ -47,7 +47,7 @@ type Props = {
 
 class SingleUser extends React.Component<Props> {
   componentDidMount() {
-    this.props.fetchUser(this.props.usersLink, this.props.name);
+    this.props.fetchUserByName(this.props.usersLink, this.props.name);
   }
 
   userDeleted = () => {
@@ -138,8 +138,8 @@ const mapStateToProps = (state, ownProps) => {
 
 const mapDispatchToProps = dispatch => {
   return {
-    fetchUser: (link: string, name: string) => {
-      dispatch(fetchUser(link, name));
+    fetchUserByName: (link: string, name: string) => {
+      dispatch(fetchUserByName(link, name));
     },
     deleteUser: (user: User, callback?: () => void) => {
       dispatch(deleteUser(user, callback));
diff --git a/scm-ui/src/users/modules/users.js b/scm-ui/src/users/modules/users.js
index 80d8107b3e..3e9420d485 100644
--- a/scm-ui/src/users/modules/users.js
+++ b/scm-ui/src/users/modules/users.js
@@ -87,12 +87,20 @@ export function fetchUsersFailure(url: string, error: Error): Action {
 }
 
 //fetch user
-export function fetchUser(link: string, name: string) {
+export function fetchUserByName(link: string, name: string) {
   const userUrl = link.endsWith("/") ? link + name : link + "/" + name;
+  return fetchUser(userUrl, name);
+}
+
+export function fetchUserByLink(user: User) {
+  return fetchUser(user._links.self.href, user.name);
+}
+
+function fetchUser(link: string, name: string) {
   return function(dispatch: any) {
     dispatch(fetchUserPending(name));
     return apiClient
-      .get(userUrl)
+      .get(link)
       .then(response => {
         return response.json();
       })
@@ -195,6 +203,9 @@ export function modifyUser(user: User, callback?: () => void) {
           callback();
         }
       })
+      .then(() => {
+        dispatch(fetchUserByLink(user));
+      })
       .catch(err => {
         dispatch(modifyUserFailure(user, err));
       });
diff --git a/scm-ui/src/users/modules/users.test.js b/scm-ui/src/users/modules/users.test.js
index 03da4658c2..9803e5af52 100644
--- a/scm-ui/src/users/modules/users.test.js
+++ b/scm-ui/src/users/modules/users.test.js
@@ -20,7 +20,8 @@ import reducer, {
   FETCH_USERS_FAILURE,
   FETCH_USERS_PENDING,
   FETCH_USERS_SUCCESS,
-  fetchUser,
+  fetchUserByLink,
+  fetchUserByName,
   fetchUserSuccess,
   getFetchUserFailure,
   fetchUsers,
@@ -166,11 +167,37 @@ describe("users fetch()", () => {
     });
   });
 
-  it("should sucessfully fetch single user", () => {
+  it("should sucessfully fetch single user by name", () => {
     fetchMock.getOnce(USERS_URL + "/zaphod", userZaphod);
 
     const store = mockStore({});
-    return store.dispatch(fetchUser(URL, "zaphod")).then(() => {
+    return store.dispatch(fetchUserByName(URL, "zaphod")).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(FETCH_USER_PENDING);
+      expect(actions[1].type).toEqual(FETCH_USER_SUCCESS);
+      expect(actions[1].payload).toBeDefined();
+    });
+  });
+
+  it("should fail fetching single user by name on HTTP 500", () => {
+    fetchMock.getOnce(USERS_URL + "/zaphod", {
+      status: 500
+    });
+
+    const store = mockStore({});
+    return store.dispatch(fetchUserByName(URL, "zaphod")).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(FETCH_USER_PENDING);
+      expect(actions[1].type).toEqual(FETCH_USER_FAILURE);
+      expect(actions[1].payload).toBeDefined();
+    });
+  });
+
+  it("should sucessfully fetch single user", () => {
+    fetchMock.getOnce("http://localhost:8081/api/v2/users/zaphod", userZaphod);
+
+    const store = mockStore({});
+    return store.dispatch(fetchUserByLink(userZaphod)).then(() => {
       const actions = store.getActions();
       expect(actions[0].type).toEqual(FETCH_USER_PENDING);
       expect(actions[1].type).toEqual(FETCH_USER_SUCCESS);
@@ -179,12 +206,12 @@ describe("users fetch()", () => {
   });
 
   it("should fail fetching single user on HTTP 500", () => {
-    fetchMock.getOnce(USERS_URL + "/zaphod", {
+    fetchMock.getOnce("http://localhost:8081/api/v2/users/zaphod", {
       status: 500
     });
 
     const store = mockStore({});
-    return store.dispatch(fetchUser(URL, "zaphod")).then(() => {
+    return store.dispatch(fetchUserByLink(userZaphod)).then(() => {
       const actions = store.getActions();
       expect(actions[0].type).toEqual(FETCH_USER_PENDING);
       expect(actions[1].type).toEqual(FETCH_USER_FAILURE);
@@ -245,13 +272,15 @@ describe("users fetch()", () => {
     fetchMock.putOnce("http://localhost:8081/api/v2/users/zaphod", {
       status: 204
     });
+    fetchMock.getOnce("http://localhost:8081/api/v2/users/zaphod", userZaphod);
 
     const store = mockStore({});
     return store.dispatch(modifyUser(userZaphod)).then(() => {
       const actions = store.getActions();
-      expect(actions.length).toBe(2);
+      expect(actions.length).toBe(3);
       expect(actions[0].type).toEqual(MODIFY_USER_PENDING);
       expect(actions[1].type).toEqual(MODIFY_USER_SUCCESS);
+      expect(actions[2].type).toEqual(FETCH_USER_PENDING);
     });
   });
 

From 7d149608f6e4ee638e653244695306a58ffa0770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 13:16:48 +0100
Subject: [PATCH 085/188] remove updating state for modifyusersuccess since
 user is always fetched afterwards

---
 scm-ui/src/users/modules/users.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scm-ui/src/users/modules/users.js b/scm-ui/src/users/modules/users.js
index 3e9420d485..5061303720 100644
--- a/scm-ui/src/users/modules/users.js
+++ b/scm-ui/src/users/modules/users.js
@@ -376,9 +376,6 @@ function byNamesReducer(state: any = {}, action: any = {}) {
     case FETCH_USER_SUCCESS:
       return reducerByName(state, action.payload.name, action.payload);
 
-    case MODIFY_USER_SUCCESS:
-      return reducerByName(state, action.payload.name, action.payload);
-
     case DELETE_USER_SUCCESS:
       const newUserByNames = deleteUserInUsersByNames(
         state,

From c4d57b1ce80f72daa17169a4d31b179f94bad39f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 13:46:59 +0100
Subject: [PATCH 086/188] remove wrong test

---
 scm-ui/src/users/modules/users.test.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/scm-ui/src/users/modules/users.test.js b/scm-ui/src/users/modules/users.test.js
index 9803e5af52..82314906fa 100644
--- a/scm-ui/src/users/modules/users.test.js
+++ b/scm-ui/src/users/modules/users.test.js
@@ -444,20 +444,6 @@ describe("users reducer", () => {
     expect(newState.byNames["ford"]).toBe(userFord);
     expect(newState.list.entries).toEqual(["zaphod"]);
   });
-
-  it("should update state according to MODIFY_USER_SUCCESS action", () => {
-    const newState = reducer(
-      {
-        byNames: {
-          ford: {
-            name: "ford"
-          }
-        }
-      },
-      modifyUserSuccess(userFord)
-    );
-    expect(newState.byNames["ford"]).toBe(userFord);
-  });
 });
 
 describe("selector tests", () => {

From bb92041e091432bbbd40375f341cf1ed5b7a64d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 13:52:46 +0100
Subject: [PATCH 087/188] fetch repo after modifying it

---
 scm-ui/src/repos/containers/RepositoryRoot.js | 12 +--
 scm-ui/src/repos/modules/repos.js             | 16 +++-
 scm-ui/src/repos/modules/repos.test.js        | 73 +++++++++++++++++--
 3 files changed, 86 insertions(+), 15 deletions(-)

diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index 9e6ada9a4e..e4b1113238 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -2,7 +2,7 @@
 import React from "react";
 import {
   deleteRepo,
-  fetchRepo,
+  fetchRepoByName,
   getFetchRepoFailure,
   getRepository,
   isFetchRepoPending
@@ -45,7 +45,7 @@ type Props = {
   repoLink: string,
 
   // dispatch functions
-  fetchRepo: (link: string, namespace: string, name: string) => void,
+  fetchRepoByName: (link: string, namespace: string, name: string) => void,
   deleteRepo: (repository: Repository, () => void) => void,
 
   // context props
@@ -56,9 +56,9 @@ type Props = {
 
 class RepositoryRoot extends React.Component<Props> {
   componentDidMount() {
-    const { fetchRepo, namespace, name, repoLink } = this.props;
+    const { fetchRepoByName, namespace, name, repoLink } = this.props;
 
-    fetchRepo(repoLink, namespace, name);
+    fetchRepoByName(repoLink, namespace, name);
   }
 
   stripEndingSlash = (url: string) => {
@@ -227,8 +227,8 @@ const mapStateToProps = (state, ownProps) => {
 
 const mapDispatchToProps = dispatch => {
   return {
-    fetchRepo: (link: string, namespace: string, name: string) => {
-      dispatch(fetchRepo(link, namespace, name));
+    fetchRepoByName: (link: string, namespace: string, name: string) => {
+      dispatch(fetchRepoByName(link, namespace, name));
     },
     deleteRepo: (repository: Repository, callback: () => void) => {
       dispatch(deleteRepo(repository, callback));
diff --git a/scm-ui/src/repos/modules/repos.js b/scm-ui/src/repos/modules/repos.js
index b5016bbb43..74550bd881 100644
--- a/scm-ui/src/repos/modules/repos.js
+++ b/scm-ui/src/repos/modules/repos.js
@@ -99,13 +99,20 @@ export function fetchReposFailure(err: Error): Action {
 }
 
 // fetch repo
+export function fetchRepoByLink(repo: Repository) {
+  return fetchRepo(repo._links.self.href, repo.namespace, repo.name);
+}
 
-export function fetchRepo(link: string, namespace: string, name: string) {
+export function fetchRepoByName(link: string, namespace: string, name: string) {
   const repoUrl = link.endsWith("/") ? link : link + "/";
+  return fetchRepo(`${repoUrl}${namespace}/${name}`, namespace, name);
+}
+
+function fetchRepo(link: string, namespace: string, name: string) {
   return function(dispatch: any) {
     dispatch(fetchRepoPending(namespace, name));
     return apiClient
-      .get(`${repoUrl}${namespace}/${name}`)
+      .get(link)
       .then(response => response.json())
       .then(repository => {
         dispatch(fetchRepoSuccess(repository));
@@ -213,6 +220,9 @@ export function modifyRepo(repository: Repository, callback?: () => void) {
           callback();
         }
       })
+      .then(() => {
+        dispatch(fetchRepoByLink(repository));
+      })
       .catch(cause => {
         const error = new Error(`failed to modify repo: ${cause.message}`);
         dispatch(modifyRepoFailure(repository, error));
@@ -347,8 +357,6 @@ export default function reducer(
   switch (action.type) {
     case FETCH_REPOS_SUCCESS:
       return normalizeByNamespaceAndName(action.payload);
-    case MODIFY_REPO_SUCCESS:
-      return reducerByNames(state, action.payload);
     case FETCH_REPO_SUCCESS:
       return reducerByNames(state, action.payload);
     default:
diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js
index 5b5c2d3abd..e24f692979 100644
--- a/scm-ui/src/repos/modules/repos.test.js
+++ b/scm-ui/src/repos/modules/repos.test.js
@@ -15,7 +15,8 @@ import reducer, {
   fetchReposByLink,
   fetchReposByPage,
   FETCH_REPO,
-  fetchRepo,
+  fetchRepoByLink,
+  fetchRepoByName,
   FETCH_REPO_PENDING,
   FETCH_REPO_SUCCESS,
   FETCH_REPO_FAILURE,
@@ -323,7 +324,7 @@ describe("repos fetch", () => {
     });
   });
 
-  it("should successfully fetch repo slarti/fjords", () => {
+  it("should successfully fetch repo slarti/fjords by name", () => {
     fetchMock.getOnce(REPOS_URL + "/slarti/fjords", slartiFjords);
 
     const expectedActions = [
@@ -343,18 +344,66 @@ describe("repos fetch", () => {
     ];
 
     const store = mockStore({});
-    return store.dispatch(fetchRepo(URL, "slarti", "fjords")).then(() => {
+    return store.dispatch(fetchRepoByName(URL, "slarti", "fjords")).then(() => {
       expect(store.getActions()).toEqual(expectedActions);
     });
   });
 
-  it("should dispatch FETCH_REPO_FAILURE, it the request for slarti/fjords fails", () => {
+  it("should dispatch FETCH_REPO_FAILURE, if the request for slarti/fjords by name fails", () => {
     fetchMock.getOnce(REPOS_URL + "/slarti/fjords", {
       status: 500
     });
 
     const store = mockStore({});
-    return store.dispatch(fetchRepo(URL, "slarti", "fjords")).then(() => {
+    return store.dispatch(fetchRepoByName(URL, "slarti", "fjords")).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(FETCH_REPO_PENDING);
+      expect(actions[1].type).toEqual(FETCH_REPO_FAILURE);
+      expect(actions[1].payload.namespace).toBe("slarti");
+      expect(actions[1].payload.name).toBe("fjords");
+      expect(actions[1].payload.error).toBeDefined();
+      expect(actions[1].itemId).toBe("slarti/fjords");
+    });
+  });
+
+  it("should successfully fetch repo slarti/fjords", () => {
+    fetchMock.getOnce(
+      "http://localhost:8081/api/v2/repositories/slarti/fjords",
+      slartiFjords
+    );
+
+    const expectedActions = [
+      {
+        type: FETCH_REPO_PENDING,
+        payload: {
+          namespace: "slarti",
+          name: "fjords"
+        },
+        itemId: "slarti/fjords"
+      },
+      {
+        type: FETCH_REPO_SUCCESS,
+        payload: slartiFjords,
+        itemId: "slarti/fjords"
+      }
+    ];
+
+    const store = mockStore({});
+    return store.dispatch(fetchRepoByLink(slartiFjords)).then(() => {
+      expect(store.getActions()).toEqual(expectedActions);
+    });
+  });
+
+  it("should dispatch FETCH_REPO_FAILURE, it the request for slarti/fjords fails", () => {
+    fetchMock.getOnce(
+      "http://localhost:8081/api/v2/repositories/slarti/fjords",
+      {
+        status: 500
+      }
+    );
+
+    const store = mockStore({});
+    return store.dispatch(fetchRepoByLink(slartiFjords)).then(() => {
       const actions = store.getActions();
       expect(actions[0].type).toEqual(FETCH_REPO_PENDING);
       expect(actions[1].type).toEqual(FETCH_REPO_FAILURE);
@@ -485,6 +534,12 @@ describe("repos fetch", () => {
     fetchMock.putOnce(slartiFjords._links.update.href, {
       status: 204
     });
+    fetchMock.getOnce(
+      "http://localhost:8081/api/v2/repositories/slarti/fjords",
+      {
+        status: 500
+      }
+    );
 
     let editedFjords = { ...slartiFjords };
     editedFjords.description = "coast of africa";
@@ -495,6 +550,7 @@ describe("repos fetch", () => {
       const actions = store.getActions();
       expect(actions[0].type).toEqual(MODIFY_REPO_PENDING);
       expect(actions[1].type).toEqual(MODIFY_REPO_SUCCESS);
+      expect(actions[2].type).toEqual(FETCH_REPO_PENDING);
     });
   });
 
@@ -502,6 +558,12 @@ describe("repos fetch", () => {
     fetchMock.putOnce(slartiFjords._links.update.href, {
       status: 204
     });
+    fetchMock.getOnce(
+      "http://localhost:8081/api/v2/repositories/slarti/fjords",
+      {
+        status: 500
+      }
+    );
 
     let editedFjords = { ...slartiFjords };
     editedFjords.description = "coast of africa";
@@ -517,6 +579,7 @@ describe("repos fetch", () => {
       const actions = store.getActions();
       expect(actions[0].type).toEqual(MODIFY_REPO_PENDING);
       expect(actions[1].type).toEqual(MODIFY_REPO_SUCCESS);
+      expect(actions[2].type).toEqual(FETCH_REPO_PENDING);
       expect(called).toBe(true);
     });
   });

From 40613744cffb297283ba84440ebfb6d10996ea17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 14:12:35 +0100
Subject: [PATCH 088/188] fetch group after modifying it

---
 scm-ui/src/groups/containers/EditGroup.js   |  7 +--
 scm-ui/src/groups/containers/SingleGroup.js | 10 ++---
 scm-ui/src/groups/modules/groups.js         | 17 +++++--
 scm-ui/src/groups/modules/groups.test.js    | 50 ++++++++++++++++++---
 4 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/scm-ui/src/groups/containers/EditGroup.js b/scm-ui/src/groups/containers/EditGroup.js
index e21731a323..3150060f5b 100644
--- a/scm-ui/src/groups/containers/EditGroup.js
+++ b/scm-ui/src/groups/containers/EditGroup.js
@@ -2,7 +2,7 @@
 import React from "react";
 import { connect } from "react-redux";
 import GroupForm from "../components/GroupForm";
-import { modifyGroup, fetchGroup } from "../modules/groups";
+import { modifyGroup } from "../modules/groups";
 import type { History } from "history";
 import { withRouter } from "react-router-dom";
 import type { Group } from "@scm-manager/ui-types";
@@ -12,7 +12,6 @@ import { ErrorNotification } from "@scm-manager/ui-components";
 type Props = {
   group: Group,
   modifyGroup: (group: Group, callback?: () => void) => void,
-  fetchGroup: (name: string) => void,
   history: History,
   loading?: boolean,
   error: Error
@@ -20,7 +19,6 @@ type Props = {
 
 class EditGroup extends React.Component<Props> {
   groupModified = (group: Group) => () => {
-    this.props.fetchGroup(group.name);
     this.props.history.push(`/group/${group.name}`);
   };
 
@@ -58,9 +56,6 @@ const mapDispatchToProps = dispatch => {
   return {
     modifyGroup: (group: Group, callback?: () => void) => {
       dispatch(modifyGroup(group, callback));
-    },
-    fetchGroup: (name: string) => {
-      dispatch(fetchGroup(name));
     }
   };
 };
diff --git a/scm-ui/src/groups/containers/SingleGroup.js b/scm-ui/src/groups/containers/SingleGroup.js
index d681859808..1dd4aa569f 100644
--- a/scm-ui/src/groups/containers/SingleGroup.js
+++ b/scm-ui/src/groups/containers/SingleGroup.js
@@ -16,7 +16,7 @@ import type { Group } from "@scm-manager/ui-types";
 import type { History } from "history";
 import {
   deleteGroup,
-  fetchGroup,
+  fetchGroupByName,
   getGroupByName,
   isFetchGroupPending,
   getFetchGroupFailure,
@@ -37,7 +37,7 @@ type Props = {
 
   // dispatcher functions
   deleteGroup: (group: Group, callback?: () => void) => void,
-  fetchGroup: (string, string) => void,
+  fetchGroupByName: (string, string) => void,
 
   // context objects
   t: string => string,
@@ -47,7 +47,7 @@ type Props = {
 
 class SingleGroup extends React.Component<Props> {
   componentDidMount() {
-    this.props.fetchGroup(this.props.groupLink, this.props.name);
+    this.props.fetchGroupByName(this.props.groupLink, this.props.name);
   }
 
   stripEndingSlash = (url: string) => {
@@ -147,8 +147,8 @@ const mapStateToProps = (state, ownProps) => {
 
 const mapDispatchToProps = dispatch => {
   return {
-    fetchGroup: (link: string, name: string) => {
-      dispatch(fetchGroup(link, name));
+    fetchGroupByName: (link: string, name: string) => {
+      dispatch(fetchGroupByName(link, name));
     },
     deleteGroup: (group: Group, callback?: () => void) => {
       dispatch(deleteGroup(group, callback));
diff --git a/scm-ui/src/groups/modules/groups.js b/scm-ui/src/groups/modules/groups.js
index 74e7214052..5e661345b8 100644
--- a/scm-ui/src/groups/modules/groups.js
+++ b/scm-ui/src/groups/modules/groups.js
@@ -84,12 +84,20 @@ export function fetchGroupsFailure(url: string, error: Error): Action {
 }
 
 //fetch group
-export function fetchGroup(link: string, name: string) {
+export function fetchGroupByLink(group: Group) {
+  return fetchGroup(group._links.self.href, group.name);
+}
+
+export function fetchGroupByName(link: string, name: string) {
   const groupUrl = link.endsWith("/") ? link + name : link + "/" + name;
+  return fetchGroup(groupUrl, name);
+}
+
+function fetchGroup(link: string, name: string) {
   return function(dispatch: any) {
     dispatch(fetchGroupPending(name));
     return apiClient
-      .get(groupUrl)
+      .get(link)
       .then(response => {
         return response.json();
       })
@@ -189,6 +197,9 @@ export function modifyGroup(group: Group, callback?: () => void) {
           callback();
         }
       })
+      .then(() => {
+        dispatch(fetchGroupByLink(group));
+      })
       .catch(cause => {
         dispatch(
           modifyGroupFailure(
@@ -361,8 +372,6 @@ function byNamesReducer(state: any = {}, action: any = {}) {
       };
     case FETCH_GROUP_SUCCESS:
       return reducerByName(state, action.payload.name, action.payload);
-    case MODIFY_GROUP_SUCCESS:
-      return reducerByName(state, action.payload.name, action.payload);
     case DELETE_GROUP_SUCCESS:
       const newGroupByNames = deleteGroupInGroupsByNames(
         state,
diff --git a/scm-ui/src/groups/modules/groups.test.js b/scm-ui/src/groups/modules/groups.test.js
index 63ab375cd3..970e96ba70 100644
--- a/scm-ui/src/groups/modules/groups.test.js
+++ b/scm-ui/src/groups/modules/groups.test.js
@@ -15,7 +15,8 @@ import reducer, {
   getFetchGroupsFailure,
   isFetchGroupsPending,
   selectListAsCollection,
-  fetchGroup,
+  fetchGroupByLink,
+  fetchGroupByName,
   FETCH_GROUP_PENDING,
   FETCH_GROUP_SUCCESS,
   FETCH_GROUP_FAILURE,
@@ -171,11 +172,40 @@ describe("groups fetch()", () => {
     });
   });
 
-  it("should sucessfully fetch single group", () => {
+  it("should sucessfully fetch single group by name", () => {
     fetchMock.getOnce(GROUPS_URL + "/humanGroup", humanGroup);
 
     const store = mockStore({});
-    return store.dispatch(fetchGroup(URL, "humanGroup")).then(() => {
+    return store.dispatch(fetchGroupByName(URL, "humanGroup")).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(FETCH_GROUP_PENDING);
+      expect(actions[1].type).toEqual(FETCH_GROUP_SUCCESS);
+      expect(actions[1].payload).toBeDefined();
+    });
+  });
+
+  it("should fail fetching single group by name on HTTP 500", () => {
+    fetchMock.getOnce(GROUPS_URL + "/humanGroup", {
+      status: 500
+    });
+
+    const store = mockStore({});
+    return store.dispatch(fetchGroupByName(URL, "humanGroup")).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(FETCH_GROUP_PENDING);
+      expect(actions[1].type).toEqual(FETCH_GROUP_FAILURE);
+      expect(actions[1].payload).toBeDefined();
+    });
+  });
+
+  it("should sucessfully fetch single group", () => {
+    fetchMock.getOnce(
+      "http://localhost:8081/api/v2/groups/humanGroup",
+      humanGroup
+    );
+
+    const store = mockStore({});
+    return store.dispatch(fetchGroupByLink(humanGroup)).then(() => {
       const actions = store.getActions();
       expect(actions[0].type).toEqual(FETCH_GROUP_PENDING);
       expect(actions[1].type).toEqual(FETCH_GROUP_SUCCESS);
@@ -184,12 +214,12 @@ describe("groups fetch()", () => {
   });
 
   it("should fail fetching single group on HTTP 500", () => {
-    fetchMock.getOnce(GROUPS_URL + "/humanGroup", {
+    fetchMock.getOnce("http://localhost:8081/api/v2/groups/humanGroup", {
       status: 500
     });
 
     const store = mockStore({});
-    return store.dispatch(fetchGroup(URL, "humanGroup")).then(() => {
+    return store.dispatch(fetchGroupByLink(humanGroup)).then(() => {
       const actions = store.getActions();
       expect(actions[0].type).toEqual(FETCH_GROUP_PENDING);
       expect(actions[1].type).toEqual(FETCH_GROUP_FAILURE);
@@ -247,6 +277,10 @@ describe("groups fetch()", () => {
     fetchMock.putOnce("http://localhost:8081/api/v2/groups/humanGroup", {
       status: 204
     });
+    fetchMock.getOnce(
+      "http://localhost:8081/api/v2/groups/humanGroup",
+      humanGroup
+    );
 
     const store = mockStore({});
 
@@ -254,6 +288,7 @@ describe("groups fetch()", () => {
       const actions = store.getActions();
       expect(actions[0].type).toEqual(MODIFY_GROUP_PENDING);
       expect(actions[1].type).toEqual(MODIFY_GROUP_SUCCESS);
+      expect(actions[2].type).toEqual(FETCH_GROUP_PENDING);
       expect(actions[1].payload).toEqual(humanGroup);
     });
   });
@@ -262,6 +297,10 @@ describe("groups fetch()", () => {
     fetchMock.putOnce("http://localhost:8081/api/v2/groups/humanGroup", {
       status: 204
     });
+    fetchMock.getOnce(
+      "http://localhost:8081/api/v2/groups/humanGroup",
+      humanGroup
+    );
 
     let called = false;
     const callback = () => {
@@ -273,6 +312,7 @@ describe("groups fetch()", () => {
       const actions = store.getActions();
       expect(actions[0].type).toEqual(MODIFY_GROUP_PENDING);
       expect(actions[1].type).toEqual(MODIFY_GROUP_SUCCESS);
+      expect(actions[2].type).toEqual(FETCH_GROUP_PENDING);
       expect(called).toBe(true);
     });
   });

From 99b50f4980afa37aae50bfe8c3dc11f8db759d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 14:20:21 +0100
Subject: [PATCH 089/188] correct tests

---
 scm-ui/src/repos/modules/repos.test.js | 13 -------------
 scm-ui/src/users/modules/users.test.js |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js
index e24f692979..e8d9873e99 100644
--- a/scm-ui/src/repos/modules/repos.test.js
+++ b/scm-ui/src/repos/modules/repos.test.js
@@ -46,7 +46,6 @@ import reducer, {
   MODIFY_REPO,
   isModifyRepoPending,
   getModifyRepoFailure,
-  modifyRepoSuccess,
   getPermissionsLink
 } from "./repos";
 import type { Repository, RepositoryCollection } from "@scm-manager/ui-types";
@@ -637,18 +636,6 @@ describe("repos reducer", () => {
     const newState = reducer({}, fetchRepoSuccess(slartiFjords));
     expect(newState.byNames["slarti/fjords"]).toBe(slartiFjords);
   });
-
-  it("should update reposByNames", () => {
-    const oldState = {
-      byNames: {
-        "slarti/fjords": slartiFjords
-      }
-    };
-    let slartiFjordsEdited = { ...slartiFjords };
-    slartiFjordsEdited.description = "I bless the rains down in Africa";
-    const newState = reducer(oldState, modifyRepoSuccess(slartiFjordsEdited));
-    expect(newState.byNames["slarti/fjords"]).toEqual(slartiFjordsEdited);
-  });
 });
 
 describe("repos selectors", () => {
diff --git a/scm-ui/src/users/modules/users.test.js b/scm-ui/src/users/modules/users.test.js
index 82314906fa..dd3abdf47a 100644
--- a/scm-ui/src/users/modules/users.test.js
+++ b/scm-ui/src/users/modules/users.test.js
@@ -34,7 +34,6 @@ import reducer, {
   MODIFY_USER_PENDING,
   MODIFY_USER_SUCCESS,
   modifyUser,
-  modifyUserSuccess,
   getUsersFromState,
   FETCH_USERS,
   getFetchUsersFailure,
@@ -288,6 +287,7 @@ describe("users fetch()", () => {
     fetchMock.putOnce("http://localhost:8081/api/v2/users/zaphod", {
       status: 204
     });
+    fetchMock.getOnce("http://localhost:8081/api/v2/users/zaphod", userZaphod);
 
     let called = false;
     const callMe = () => {

From afb315ce412a2e7f095dd5073e03eab8afebd247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 14:42:28 +0100
Subject: [PATCH 090/188] create branch


From 67d6a8190e8be68e5356c6c7a9e73932f894c10e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 14:56:56 +0100
Subject: [PATCH 091/188] remove password fields if user is edited

---
 scm-ui/src/repos/containers/RepositoryRoot.js | 27 ++++++++----
 scm-ui/src/users/components/UserForm.js       | 42 +++++++++++--------
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index e3043b1041..275bee8c8a 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -1,19 +1,32 @@
 //@flow
 import React from "react";
-import {deleteRepo, fetchRepo, getFetchRepoFailure, getRepository, isFetchRepoPending} from "../modules/repos";
+import {
+  deleteRepo,
+  fetchRepo,
+  getFetchRepoFailure,
+  getRepository,
+  isFetchRepoPending
+} from "../modules/repos";
 
-import {connect} from "react-redux";
-import {Route, Switch} from "react-router-dom";
-import type {Repository} from "@scm-manager/ui-types";
+import { connect } from "react-redux";
+import { Route, Switch } from "react-router-dom";
+import type { Repository } from "@scm-manager/ui-types";
 
-import {ErrorPage, Loading, Navigation, NavLink, Page, Section} from "@scm-manager/ui-components";
-import {translate} from "react-i18next";
+import {
+  ErrorPage,
+  Loading,
+  Navigation,
+  NavLink,
+  Page,
+  Section
+} from "@scm-manager/ui-components";
+import { translate } from "react-i18next";
 import RepositoryDetails from "../components/RepositoryDetails";
 import DeleteNavAction from "../components/DeleteNavAction";
 import Edit from "../containers/Edit";
 import Permissions from "../permissions/containers/Permissions";
 
-import type {History} from "history";
+import type { History } from "history";
 import EditNavLink from "../components/EditNavLink";
 
 import BranchRoot from "./ChangesetsRoot";
diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js
index 80ade5e070..94daa53b63 100644
--- a/scm-ui/src/users/components/UserForm.js
+++ b/scm-ui/src/users/components/UserForm.js
@@ -89,6 +89,7 @@ class UserForm extends React.Component<Props, State> {
     const user = this.state.user;
 
     let nameField = null;
+    let passwordFields = null;
     if (!this.props.user) {
       nameField = (
         <InputField
@@ -100,6 +101,28 @@ class UserForm extends React.Component<Props, State> {
           helpText={t("help.usernameHelpText")}
         />
       );
+      passwordFields = (
+        <>
+          <InputField
+            label={t("user.password")}
+            type="password"
+            onChange={this.handlePasswordChange}
+            value={user ? user.password : ""}
+            validationError={this.state.validatePasswordError}
+            errorMessage={t("validation.password-invalid")}
+            helpText={t("help.passwordHelpText")}
+          />
+          <InputField
+            label={t("validation.validatePassword")}
+            type="password"
+            onChange={this.handlePasswordValidationChange}
+            value={this.state ? this.state.validatePassword : ""}
+            validationError={this.state.passwordValidationError}
+            errorMessage={t("validation.passwordValidation-invalid")}
+            helpText={t("help.passwordConfirmHelpText")}
+          />
+        </>
+      );
     }
     return (
       <form onSubmit={this.submit}>
@@ -120,24 +143,7 @@ class UserForm extends React.Component<Props, State> {
           errorMessage={t("validation.mail-invalid")}
           helpText={t("help.mailHelpText")}
         />
-        <InputField
-          label={t("user.password")}
-          type="password"
-          onChange={this.handlePasswordChange}
-          value={user ? user.password : ""}
-          validationError={this.state.validatePasswordError}
-          errorMessage={t("validation.password-invalid")}
-          helpText={t("help.passwordHelpText")}
-        />
-        <InputField
-          label={t("validation.validatePassword")}
-          type="password"
-          onChange={this.handlePasswordValidationChange}
-          value={this.state ? this.state.validatePassword : ""}
-          validationError={this.state.passwordValidationError}
-          errorMessage={t("validation.passwordValidation-invalid")}
-          helpText={t("help.passwordConfirmHelpText")}
-        />
+        {passwordFields}
         <Checkbox
           label={t("user.admin")}
           onChange={this.handleAdminChange}

From be54c74228f4bc8aa664c6e9e77354139814e47e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 15:08:58 +0100
Subject: [PATCH 092/188] add route to set password component

---
 scm-ui/public/locales/en/users.json           |  3 ++
 .../src/users/components/SetUserPassword.js   | 17 ++++++++++
 .../components/navLinks/SetPasswordNavLink.js | 28 +++++++++++++++++
 .../navLinks/SetPasswordNavLink.test.js       | 31 +++++++++++++++++++
 scm-ui/src/users/components/navLinks/index.js |  1 +
 scm-ui/src/users/containers/SingleUser.js     | 15 ++++++++-
 6 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 scm-ui/src/users/components/SetUserPassword.js
 create mode 100644 scm-ui/src/users/components/navLinks/SetPasswordNavLink.js
 create mode 100644 scm-ui/src/users/components/navLinks/SetPasswordNavLink.test.js

diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json
index 07540134be..34f2a9deb4 100644
--- a/scm-ui/public/locales/en/users.json
+++ b/scm-ui/public/locales/en/users.json
@@ -29,6 +29,9 @@
   "edit-user-button": {
     "label": "Edit"
   },
+  "set-password-button": {
+    "label": "Set password"
+  },
   "user-form": {
     "submit": "Submit"
   },
diff --git a/scm-ui/src/users/components/SetUserPassword.js b/scm-ui/src/users/components/SetUserPassword.js
new file mode 100644
index 0000000000..fea841b985
--- /dev/null
+++ b/scm-ui/src/users/components/SetUserPassword.js
@@ -0,0 +1,17 @@
+// @flow
+import React from "react";
+import type { User } from "@scm-manager/ui-types";
+
+type Props = {
+  user: User
+};
+
+export default class SetUserPassword extends React.Component<Props> {
+
+  render() {
+
+    return (
+      "Hey, Change Password!"
+    );
+  }
+}
diff --git a/scm-ui/src/users/components/navLinks/SetPasswordNavLink.js b/scm-ui/src/users/components/navLinks/SetPasswordNavLink.js
new file mode 100644
index 0000000000..43b7a4b5a4
--- /dev/null
+++ b/scm-ui/src/users/components/navLinks/SetPasswordNavLink.js
@@ -0,0 +1,28 @@
+//@flow
+import React from "react";
+import { translate } from "react-i18next";
+import type { User } from "@scm-manager/ui-types";
+import { NavLink } from "@scm-manager/ui-components";
+
+type Props = {
+  t: string => string,
+  user: User,
+  passwordUrl: String
+};
+
+class ChangePasswordNavLink extends React.Component<Props> {
+  render() {
+    const { t, passwordUrl } = this.props;
+
+    if (!this.hasPermissionToSetPassword()) {
+      return null;
+    }
+    return <NavLink label={t("set-password-button.label")} to={passwordUrl} />;
+  }
+
+  hasPermissionToSetPassword = () => {
+    return this.props.user._links.password;
+  };
+}
+
+export default translate("users")(ChangePasswordNavLink);
diff --git a/scm-ui/src/users/components/navLinks/SetPasswordNavLink.test.js b/scm-ui/src/users/components/navLinks/SetPasswordNavLink.test.js
new file mode 100644
index 0000000000..75ce4e58cf
--- /dev/null
+++ b/scm-ui/src/users/components/navLinks/SetPasswordNavLink.test.js
@@ -0,0 +1,31 @@
+import React from "react";
+import { shallow } from "enzyme";
+import "../../../tests/enzyme";
+import "../../../tests/i18n";
+import ChangePasswordNavLink from "./SetPasswordNavLink";
+
+it("should render nothing, if the password link is missing", () => {
+  const user = {
+    _links: {}
+  };
+
+  const navLink = shallow(
+    <ChangePasswordNavLink user={user} passwordUrl="/user/password" />
+  );
+  expect(navLink.text()).toBe("");
+});
+
+it("should render the navLink", () => {
+  const user = {
+    _links: {
+      password: {
+        href: "/password"
+      }
+    }
+  };
+
+  const navLink = shallow(
+    <ChangePasswordNavLink user={user} passwordUrl="/user/password" />
+  );
+  expect(navLink.text()).not.toBe("");
+});
diff --git a/scm-ui/src/users/components/navLinks/index.js b/scm-ui/src/users/components/navLinks/index.js
index a3ccd16a32..a6d8370c00 100644
--- a/scm-ui/src/users/components/navLinks/index.js
+++ b/scm-ui/src/users/components/navLinks/index.js
@@ -1,2 +1,3 @@
 export { default as DeleteUserNavLink } from "./DeleteUserNavLink";
 export { default as EditUserNavLink } from "./EditUserNavLink";
+export { default as SetPasswordNavLink } from "./SetPasswordNavLink";
diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js
index f581874742..a88d517c55 100644
--- a/scm-ui/src/users/containers/SingleUser.js
+++ b/scm-ui/src/users/containers/SingleUser.js
@@ -24,9 +24,14 @@ import {
   getDeleteUserFailure
 } from "../modules/users";
 
-import { DeleteUserNavLink, EditUserNavLink } from "./../components/navLinks";
+import {
+  DeleteUserNavLink,
+  EditUserNavLink,
+  SetPasswordNavLink
+} from "./../components/navLinks";
 import { translate } from "react-i18next";
 import { getUsersLink } from "../../modules/indexResource";
+import SetUserPassword from "../components/SetUserPassword";
 
 type Props = {
   name: string,
@@ -97,6 +102,10 @@ class SingleUser extends React.Component<Props> {
               path={`${url}/edit`}
               component={() => <EditUser user={user} />}
             />
+            <Route
+              path={`${url}/password`}
+              component={() => <SetUserPassword user={user} />}
+            />
           </div>
           <div className="column">
             <Navigation>
@@ -106,6 +115,10 @@ class SingleUser extends React.Component<Props> {
                   label={t("single-user.information-label")}
                 />
                 <EditUserNavLink user={user} editUrl={`${url}/edit`} />
+                <SetPasswordNavLink
+                  user={user}
+                  passwordUrl={`${url}/password`}
+                />
               </Section>
               <Section label={t("single-user.actions-label")}>
                 <DeleteUserNavLink user={user} deleteUser={this.deleteUser} />

From 4e444c14494c82dfd33bdfa0fc2baccf342f25d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 15:18:44 +0100
Subject: [PATCH 093/188] add view for passwords (without functionality)

---
 .../src/users/components/SetUserPassword.js   | 98 ++++++++++++++++++-
 1 file changed, 94 insertions(+), 4 deletions(-)

diff --git a/scm-ui/src/users/components/SetUserPassword.js b/scm-ui/src/users/components/SetUserPassword.js
index fea841b985..d47336bdef 100644
--- a/scm-ui/src/users/components/SetUserPassword.js
+++ b/scm-ui/src/users/components/SetUserPassword.js
@@ -1,17 +1,107 @@
 // @flow
 import React from "react";
 import type { User } from "@scm-manager/ui-types";
+import { InputField, SubmitButton } from "@scm-manager/ui-components";
+import * as userValidator from "./userValidation";
+import { translate } from "react-i18next";
 
 type Props = {
-  user: User
+  user: User,
+  t: string => string
 };
 
-export default class SetUserPassword extends React.Component<Props> {
+type State = {
+  password: string,
+  loading: boolean,
+  passwordValidationError: boolean,
+  validatePasswordError: boolean,
+  validatePassword: string
+};
+
+class SetUserPassword extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+
+    this.state = {
+      password: "",
+      loading: false,
+      passwordValidationError: false,
+      validatePasswordError: false,
+      validatePassword: ""
+    };
+  }
+
+  isValid = () => {
+    return !(
+      this.state.validatePasswordError || this.state.passwordValidationError
+    );
+  };
+
+  submit = (event: Event) => {
+    event.preventDefault();
+    if (this.isValid()) {
+      //TODO:hier update pw!
+    }
+  };
 
   render() {
-
+    const { user, t } = this.props;
+    const { loading } = this.state;
     return (
-      "Hey, Change Password!"
+      <form onSubmit={this.submit}>
+        <InputField
+          label={t("user.password")}
+          type="password"
+          onChange={this.handlePasswordChange}
+          value={user ? user.password : ""}
+          validationError={this.state.validatePasswordError}
+          errorMessage={t("validation.password-invalid")}
+          helpText={t("help.passwordHelpText")}
+        />
+        <InputField
+          label={t("validation.validatePassword")}
+          type="password"
+          onChange={this.handlePasswordValidationChange}
+          value={this.state ? this.state.validatePassword : ""}
+          validationError={this.state.passwordValidationError}
+          errorMessage={t("validation.passwordValidation-invalid")}
+          helpText={t("help.passwordConfirmHelpText")}
+        />
+        <SubmitButton
+          disabled={!this.isValid()}
+          loading={loading}
+          label={t("user-form.submit")}
+        />
+      </form>
     );
   }
+
+  handlePasswordChange = (password: string) => {
+    const validatePasswordError = !this.checkPasswords(
+      password,
+      this.state.validatePassword
+    );
+    this.setState({
+      validatePasswordError: !userValidator.isPasswordValid(password),
+      passwordValidationError: validatePasswordError,
+      password: password
+    });
+  };
+
+  handlePasswordValidationChange = (validatePassword: string) => {
+    const validatePasswordError = this.checkPasswords(
+      this.state.password,
+      validatePassword
+    );
+    this.setState({
+      validatePassword,
+      passwordValidationError: !validatePasswordError
+    });
+  };
+
+  checkPasswords = (password1: string, password2: string) => {
+    return password1 === password2;
+  };
 }
+
+export default translate("users")(SetUserPassword);

From 521f3dd9e9c164a7295492cad296eb823a0e2de7 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Mon, 5 Nov 2018 16:03:54 +0100
Subject: [PATCH 094/188] Implemented Profile component

---
 .../ui-components/src/layout/Footer.js        |  3 +-
 scm-ui-components/packages/ui-types/src/Me.js |  3 +-
 scm-ui/public/locales/en/users.json           |  3 +
 scm-ui/src/containers/Main.js                 |  7 ++
 scm-ui/src/modules/auth.js                    |  8 +-
 scm-ui/src/modules/auth.test.js               |  6 +-
 scm-ui/src/users/containers/Profile.js        | 90 +++++++++++++++++++
 7 files changed, 115 insertions(+), 5 deletions(-)
 create mode 100644 scm-ui/src/users/containers/Profile.js

diff --git a/scm-ui-components/packages/ui-components/src/layout/Footer.js b/scm-ui-components/packages/ui-components/src/layout/Footer.js
index 4072711c7a..11ed52ac63 100644
--- a/scm-ui-components/packages/ui-components/src/layout/Footer.js
+++ b/scm-ui-components/packages/ui-components/src/layout/Footer.js
@@ -1,6 +1,7 @@
 //@flow
 import React from "react";
 import type { Me } from "@scm-manager/ui-types";
+import {Link} from "react-router-dom";
 
 type Props = {
   me?: Me
@@ -15,7 +16,7 @@ class Footer extends React.Component<Props> {
     return (
       <footer className="footer">
         <div className="container is-centered">
-          <p className="has-text-centered">{me.displayName}</p>
+          <p className="has-text-centered"><Link to={"/me"}>{me.displayName}</Link></p>
         </div>
       </footer>
     );
diff --git a/scm-ui-components/packages/ui-types/src/Me.js b/scm-ui-components/packages/ui-types/src/Me.js
index 65e4fc8336..ab67debae7 100644
--- a/scm-ui-components/packages/ui-types/src/Me.js
+++ b/scm-ui-components/packages/ui-types/src/Me.js
@@ -2,5 +2,6 @@
 
 export type Me = {
   name: string,
-  displayName: string
+  displayName: string,
+  mail: string
 };
diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json
index 07540134be..2c29039f67 100644
--- a/scm-ui/public/locales/en/users.json
+++ b/scm-ui/public/locales/en/users.json
@@ -44,6 +44,9 @@
     "information-label": "Information",
     "back-label": "Back"
   },
+  "profile": {
+    "change-pw": "Change Password"
+  },
   "validation": {
     "mail-invalid": "This email is invalid",
     "name-invalid": "This name is invalid",
diff --git a/scm-ui/src/containers/Main.js b/scm-ui/src/containers/Main.js
index a971bab54d..97ffa60125 100644
--- a/scm-ui/src/containers/Main.js
+++ b/scm-ui/src/containers/Main.js
@@ -19,6 +19,7 @@ import SingleGroup from "../groups/containers/SingleGroup";
 import AddGroup from "../groups/containers/AddGroup";
 
 import Config from "../config/containers/Config";
+import Profile from "../users/containers/Profile";
 
 type Props = {
   authenticated?: boolean
@@ -106,6 +107,12 @@ class Main extends React.Component<Props> {
             component={Config}
             authenticated={authenticated}
           />
+          <ProtectedRoute
+            exact
+            path="/me"
+            component={Profile}
+            authenticated={authenticated}
+          />
         </Switch>
       </div>
     );
diff --git a/scm-ui/src/modules/auth.js b/scm-ui/src/modules/auth.js
index fe636ac9d3..691ae2b128 100644
--- a/scm-ui/src/modules/auth.js
+++ b/scm-ui/src/modules/auth.js
@@ -1,5 +1,5 @@
 // @flow
-import type { Me } from "@scm-manager/ui-components";
+import type { Me } from "@scm-manager/ui-types";
 import * as types from "./types";
 
 import { apiClient, UNAUTHORIZED_ERROR } from "@scm-manager/ui-components";
@@ -136,7 +136,11 @@ const callFetchMe = (link: string): Promise<Me> => {
       return response.json();
     })
     .then(json => {
-      return { name: json.name, displayName: json.displayName };
+      return {
+        name: json.name,
+        displayName: json.displayName,
+        mail: json.mail
+      };
     });
 };
 
diff --git a/scm-ui/src/modules/auth.test.js b/scm-ui/src/modules/auth.test.js
index 1839701e0a..7236f803a8 100644
--- a/scm-ui/src/modules/auth.test.js
+++ b/scm-ui/src/modules/auth.test.js
@@ -37,7 +37,11 @@ import {
   FETCH_INDEXRESOURCES_SUCCESS
 } from "./indexResource";
 
-const me = { name: "tricia", displayName: "Tricia McMillian" };
+const me = {
+  name: "tricia",
+  displayName: "Tricia McMillian",
+  mail: "trillian@heartofgold.universe"
+};
 
 describe("auth reducer", () => {
   it("should set me and login on successful fetch of me", () => {
diff --git a/scm-ui/src/users/containers/Profile.js b/scm-ui/src/users/containers/Profile.js
new file mode 100644
index 0000000000..b8aa3ae068
--- /dev/null
+++ b/scm-ui/src/users/containers/Profile.js
@@ -0,0 +1,90 @@
+// @flow
+
+import React from "react";
+
+import {
+  Page,
+  Navigation,
+  Section,
+  MailLink
+} from "@scm-manager/ui-components";
+import { NavLink } from "react-router-dom";
+import { getMe } from "../../modules/auth";
+import { compose } from "redux";
+import { connect } from "react-redux";
+import { translate } from "react-i18next";
+import type { Me } from "@scm-manager/ui-types";
+import AvatarWrapper from "../../repos/components/changesets/AvatarWrapper";
+
+type Props = {
+  me: Me,
+
+  // Context props
+  t: string => string
+};
+type State = {};
+
+class Profile extends React.Component<Props, State> {
+  render() {
+    const { me, t } = this.props;
+
+    if (!me) {
+      return null;
+    }
+    return (
+      <Page title={me.displayName}>
+        <div className="columns">
+          <AvatarWrapper>
+            <div>
+              <figure className="media-left">
+                <p className="image is-64x64">
+                  {
+                    // TODO: add avatar
+                  }
+                  }
+                </p>
+              </figure>
+            </div>
+          </AvatarWrapper>
+          <div className="column is-two-quarters">
+            <table className="table">
+              <tbody>
+                <tr>
+                  <td>{t("user.name")}</td>
+                  <td>{me.name}</td>
+                </tr>
+                <tr>
+                  <td>{t("user.displayName")}</td>
+                  <td>{me.displayName}</td>
+                </tr>
+                <tr>
+                  <td>{t("user.mail")}</td>
+                  <td>
+                    <MailLink address={me.mail} />
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+          <div className="column is-one-quarter">
+            <Navigation>
+              <Section label={t("single-user.actions-label")} />
+              <NavLink to={"me/password"}>{t("profile.change-pw")}</NavLink>
+            </Navigation>
+          </div>
+        </div>
+      </Page>
+    );
+  }
+}
+
+const mapStateToProps = state => {
+  return {
+    me: getMe(state)
+  };
+};
+
+export default compose(
+  translate("users"),
+  connect(mapStateToProps)
+)(Profile);

From c6bc385b2f2ed513e54d9fc49bc52f913e461d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 16:14:54 +0100
Subject: [PATCH 095/188] update password function

---
 scm-ui/public/locales/en/users.json           |  3 +
 .../src/users/components/SetUserPassword.js   | 62 +++++++++++++++++--
 scm-ui/src/users/components/updatePassword.js | 16 +++++
 .../users/components/updatePassword.test.js   | 23 +++++++
 4 files changed, 98 insertions(+), 6 deletions(-)
 create mode 100644 scm-ui/src/users/components/updatePassword.js
 create mode 100644 scm-ui/src/users/components/updatePassword.test.js

diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json
index 34f2a9deb4..b5b98fc915 100644
--- a/scm-ui/public/locales/en/users.json
+++ b/scm-ui/public/locales/en/users.json
@@ -55,6 +55,9 @@
     "passwordValidation-invalid": "Passwords have to be the same",
     "validatePassword": "Please validate password here"
   },
+  "password": {
+    "set-password-successful": "Password is set successful"
+  },
   "help": {
     "usernameHelpText": "Unique name of the user.",
     "displayNameHelpText": "Display name of the user.",
diff --git a/scm-ui/src/users/components/SetUserPassword.js b/scm-ui/src/users/components/SetUserPassword.js
index d47336bdef..0ceab52878 100644
--- a/scm-ui/src/users/components/SetUserPassword.js
+++ b/scm-ui/src/users/components/SetUserPassword.js
@@ -1,9 +1,14 @@
 // @flow
 import React from "react";
 import type { User } from "@scm-manager/ui-types";
-import { InputField, SubmitButton } from "@scm-manager/ui-components";
+import {
+  InputField,
+  SubmitButton,
+  Notification
+} from "@scm-manager/ui-components";
 import * as userValidator from "./userValidation";
 import { translate } from "react-i18next";
+import { updatePassword } from "./updatePassword";
 
 type Props = {
   user: User,
@@ -15,7 +20,9 @@ type State = {
   loading: boolean,
   passwordValidationError: boolean,
   validatePasswordError: boolean,
-  validatePassword: string
+  validatePassword: string,
+  error?: Error,
+  passwordChanged: boolean
 };
 
 class SetUserPassword extends React.Component<Props, State> {
@@ -27,7 +34,8 @@ class SetUserPassword extends React.Component<Props, State> {
       loading: false,
       passwordValidationError: false,
       validatePasswordError: false,
-      validatePassword: ""
+      validatePassword: "",
+      passwordChanged: false
     };
   }
 
@@ -38,22 +46,57 @@ class SetUserPassword extends React.Component<Props, State> {
   };
 
   submit = (event: Event) => {
+    //TODO: set loading
     event.preventDefault();
     if (this.isValid()) {
-      //TODO:hier update pw!
+      const { user } = this.props;
+      const { password } = this.state;
+      updatePassword(user._links.password.href, password)
+        .then(result => {
+          if (result.error || result.status !== 204) {
+            this.setState({
+              ...this.state,
+              error: result.error,
+              loading: false
+            });
+          } else {
+            this.setState({
+              ...this.state,
+              loading: false,
+              passwordChanged: true,
+              password: "",
+              validatePassword: ""
+            });
+          }
+        })
+        .catch(err => {});
     }
   };
 
   render() {
     const { user, t } = this.props;
-    const { loading } = this.state;
+    const { loading, passwordChanged } = this.state;
+
+    let passwordChangedSuccessful = null;
+
+    if (passwordChanged) {
+      passwordChangedSuccessful = (
+        <Notification
+          type={"success"}
+          children={t("password.set-password-successful")}
+          onClose={() => this.onClose()}
+        />
+      );
+    }
+
     return (
       <form onSubmit={this.submit}>
+        {passwordChangedSuccessful}
         <InputField
           label={t("user.password")}
           type="password"
           onChange={this.handlePasswordChange}
-          value={user ? user.password : ""}
+          value={this.state.password ? this.state.password : ""}
           validationError={this.state.validatePasswordError}
           errorMessage={t("validation.password-invalid")}
           helpText={t("help.passwordHelpText")}
@@ -102,6 +145,13 @@ class SetUserPassword extends React.Component<Props, State> {
   checkPasswords = (password1: string, password2: string) => {
     return password1 === password2;
   };
+
+  onClose = () => {
+    this.setState({
+      ...this.state,
+      passwordChanged: false
+    });
+  };
 }
 
 export default translate("users")(SetUserPassword);
diff --git a/scm-ui/src/users/components/updatePassword.js b/scm-ui/src/users/components/updatePassword.js
new file mode 100644
index 0000000000..fb5adfaf2a
--- /dev/null
+++ b/scm-ui/src/users/components/updatePassword.js
@@ -0,0 +1,16 @@
+//@flow
+import { apiClient } from "@scm-manager/ui-components";
+const CONTENT_TYPE_USER = "application/vnd.scmm-passwordOverwrite+json;v=2";
+
+export function updatePassword(url: string, password: string) {
+  return apiClient
+    .put(url, { newPassword: password }, CONTENT_TYPE_USER)
+    .then(response => {
+      return {
+        status: response.status
+      };
+    })
+    .catch(err => {
+      return { error: err };
+    });
+}
diff --git a/scm-ui/src/users/components/updatePassword.test.js b/scm-ui/src/users/components/updatePassword.test.js
new file mode 100644
index 0000000000..a5762406b2
--- /dev/null
+++ b/scm-ui/src/users/components/updatePassword.test.js
@@ -0,0 +1,23 @@
+//@flow
+import fetchMock from "fetch-mock";
+import { updatePassword } from "./updatePassword";
+
+describe("get content type", () => {
+  const PASSWORD_URL = "/users/testuser/password";
+  const password = "testpw123";
+
+  afterEach(() => {
+    fetchMock.reset();
+    fetchMock.restore();
+  });
+
+  it("should update password", done => {
+
+    fetchMock.put("/api/v2" + PASSWORD_URL, 204);
+
+    updatePassword(PASSWORD_URL, password).then(content => {
+
+      done();
+    });
+  });
+});

From 3c63d994c6e240fc4c4677a86a59515d6cf5e3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 16:28:46 +0100
Subject: [PATCH 096/188] show error and loading state

---
 .../src/users/components/SetUserPassword.js   | 59 +++++++++++++------
 scm-ui/src/users/components/updatePassword.js |  4 +-
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/scm-ui/src/users/components/SetUserPassword.js b/scm-ui/src/users/components/SetUserPassword.js
index 0ceab52878..a4a91c4083 100644
--- a/scm-ui/src/users/components/SetUserPassword.js
+++ b/scm-ui/src/users/components/SetUserPassword.js
@@ -4,7 +4,8 @@ import type { User } from "@scm-manager/ui-types";
 import {
   InputField,
   SubmitButton,
-  Notification
+  Notification,
+  ErrorNotification
 } from "@scm-manager/ui-components";
 import * as userValidator from "./userValidation";
 import { translate } from "react-i18next";
@@ -45,28 +46,46 @@ class SetUserPassword extends React.Component<Props, State> {
     );
   };
 
+  setLoadingState = () => {
+    this.setState({
+      ...this.state,
+      loading: true
+    });
+  };
+
+  setErrorState = (error: Error) => {
+    this.setState({
+      ...this.state,
+      error: error,
+      loading: false
+    });
+  };
+
+  setSuccessfulState = () => {
+    this.setState({
+      ...this.state,
+      loading: false,
+      passwordChanged: true,
+      password: "",
+      validatePassword: "",
+      validatePasswordError: false,
+      passwordValidationError: false
+    });
+  };
+
   submit = (event: Event) => {
     //TODO: set loading
     event.preventDefault();
     if (this.isValid()) {
       const { user } = this.props;
       const { password } = this.state;
+      this.setLoadingState();
       updatePassword(user._links.password.href, password)
         .then(result => {
-          if (result.error || result.status !== 204) {
-            this.setState({
-              ...this.state,
-              error: result.error,
-              loading: false
-            });
+          if (result.error) {
+            this.setErrorState(result.error);
           } else {
-            this.setState({
-              ...this.state,
-              loading: false,
-              passwordChanged: true,
-              password: "",
-              validatePassword: ""
-            });
+            this.setSuccessfulState();
           }
         })
         .catch(err => {});
@@ -74,24 +93,26 @@ class SetUserPassword extends React.Component<Props, State> {
   };
 
   render() {
-    const { user, t } = this.props;
-    const { loading, passwordChanged } = this.state;
+    const { t } = this.props;
+    const { loading, passwordChanged, error } = this.state;
 
-    let passwordChangedSuccessful = null;
+    let message = null;
 
     if (passwordChanged) {
-      passwordChangedSuccessful = (
+      message = (
         <Notification
           type={"success"}
           children={t("password.set-password-successful")}
           onClose={() => this.onClose()}
         />
       );
+    } else if (error) {
+      message = <ErrorNotification error={error} />;
     }
 
     return (
       <form onSubmit={this.submit}>
-        {passwordChangedSuccessful}
+        {message}
         <InputField
           label={t("user.password")}
           type="password"
diff --git a/scm-ui/src/users/components/updatePassword.js b/scm-ui/src/users/components/updatePassword.js
index fb5adfaf2a..e2ef8c0a02 100644
--- a/scm-ui/src/users/components/updatePassword.js
+++ b/scm-ui/src/users/components/updatePassword.js
@@ -6,9 +6,7 @@ export function updatePassword(url: string, password: string) {
   return apiClient
     .put(url, { newPassword: password }, CONTENT_TYPE_USER)
     .then(response => {
-      return {
-        status: response.status
-      };
+      return response;
     })
     .catch(err => {
       return { error: err };

From 2508a1b9b71e96355381ec4f8d2ee123993606a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 5 Nov 2018 16:42:20 +0100
Subject: [PATCH 097/188] Implement log between two changesets for git

---
 .../scm/repository/api/LogCommandBuilder.java |  5 +++
 .../scm/repository/spi/LogCommandRequest.java | 17 ++++++++--
 .../scm/repository/spi/GitLogCommand.java     | 31 ++++++++++++++++--
 .../scm/repository/spi/GitLogCommandTest.java | 32 +++++++++++++++----
 4 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/LogCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/LogCommandBuilder.java
index 9c782a781b..3db8d6aae0 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/LogCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/LogCommandBuilder.java
@@ -398,6 +398,11 @@ public final class LogCommandBuilder
     return this;
   }
 
+  public LogCommandBuilder setAncestorChangeset(String ancestorChangeset) {
+    request.setAncestorChangeset(ancestorChangeset);
+    return this;
+  }
+
   //~--- inner classes --------------------------------------------------------
 
   /**
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/LogCommandRequest.java b/scm-core/src/main/java/sonia/scm/repository/spi/LogCommandRequest.java
index 9356bb212a..92cd41662b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/LogCommandRequest.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/LogCommandRequest.java
@@ -84,7 +84,8 @@ public final class LogCommandRequest implements Serializable, Resetable
       && Objects.equal(pagingStart, other.pagingStart)
       && Objects.equal(pagingLimit, other.pagingLimit)
       && Objects.equal(path, other.path) 
-      && Objects.equal(branch, other.branch);
+      && Objects.equal(branch, other.branch)
+      && Objects.equal(ancestorChangeset, other.ancestorChangeset);
     //J+
   }
 
@@ -98,7 +99,7 @@ public final class LogCommandRequest implements Serializable, Resetable
   public int hashCode()
   {
     return Objects.hashCode(startChangeset, endChangeset, pagingStart,
-      pagingLimit, path, branch);
+      pagingLimit, path, branch, ancestorChangeset);
   }
 
   /**
@@ -114,6 +115,7 @@ public final class LogCommandRequest implements Serializable, Resetable
     pagingLimit = 20;
     path = null;
     branch = null;
+    ancestorChangeset = null;
   }
 
   /**
@@ -133,6 +135,7 @@ public final class LogCommandRequest implements Serializable, Resetable
                   .add("pagingLimit", pagingLimit)
                   .add("path", path)
                   .add("branch", branch)
+                  .add("ancestorChangeset", ancestorChangeset)
                   .toString();
     //J+
   }
@@ -205,6 +208,10 @@ public final class LogCommandRequest implements Serializable, Resetable
     this.startChangeset = startChangeset;
   }
 
+  public void setAncestorChangeset(String ancestorChangeset) {
+    this.ancestorChangeset = ancestorChangeset;
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**
@@ -284,6 +291,10 @@ public final class LogCommandRequest implements Serializable, Resetable
     return pagingLimit < 0;
   }
 
+  public String getAncestorChangeset() {
+    return ancestorChangeset;
+  }
+
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
@@ -303,4 +314,6 @@ public final class LogCommandRequest implements Serializable, Resetable
 
   /** Field description */
   private String startChangeset;
+
+  private String ancestorChangeset;
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
index 4e9261f517..7175df81f4 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
@@ -43,6 +43,7 @@ import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.revwalk.filter.RevFilter;
 import org.eclipse.jgit.treewalk.filter.AndTreeFilter;
 import org.eclipse.jgit.treewalk.filter.PathFilter;
 import org.eclipse.jgit.treewalk.filter.TreeFilter;
@@ -198,6 +199,14 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
           endId = repository.resolve(request.getEndChangeset());
         }
 
+        Ref branch = getBranchOrDefault(repository,request.getBranch());
+
+        ObjectId ancestorId = null;
+
+        if (!Strings.isNullOrEmpty(request.getAncestorChangeset())) {
+          ancestorId = computeCommonAncestor(request, repository, startId, branch);
+        }
+
         revWalk = new RevWalk(repository);
 
         converter = new GitChangesetConverter(repository, revWalk);
@@ -208,8 +217,6 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
               PathFilter.create(request.getPath()), TreeFilter.ANY_DIFF));
         }
 
-        Ref branch = getBranchOrDefault(repository,request.getBranch());
-
         if (branch != null) {
           if (startId != null) {
             revWalk.markStart(revWalk.lookupCommit(startId));
@@ -217,11 +224,16 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
             revWalk.markStart(revWalk.lookupCommit(branch.getObjectId()));
           }
 
+
           Iterator<RevCommit> iterator = revWalk.iterator();
 
           while (iterator.hasNext()) {
             RevCommit commit = iterator.next();
 
+            if (commit.getId().equals(ancestorId)) {
+              break;
+            }
+
             if ((counter >= start)
               && ((limit < 0) || (counter < start + limit))) {
               changesetList.add(converter.createChangeset(commit));
@@ -229,7 +241,7 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
 
             counter++;
 
-            if ((endId != null) && commit.getId().equals(endId)) {
+            if (commit.getId().equals(endId)) {
               break;
             }
           }
@@ -263,4 +275,17 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
 
     return changesets;
   }
+
+  private ObjectId computeCommonAncestor(LogCommandRequest request, Repository repository, ObjectId startId, Ref branch) throws IOException {
+    try (RevWalk mergeBaseWalk = new RevWalk(repository)) {
+      mergeBaseWalk.setRevFilter(RevFilter.MERGE_BASE);
+      if (startId != null) {
+        mergeBaseWalk.markStart(mergeBaseWalk.lookupCommit(startId));
+      } else {
+        mergeBaseWalk.markStart(mergeBaseWalk.lookupCommit(branch.getObjectId()));
+      }
+      mergeBaseWalk.markStart(mergeBaseWalk.parseCommit(repository.resolve(request.getAncestorChangeset())));
+      return mergeBaseWalk.next().getId();
+    }
+  }
 }
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java
index 78db8ae686..4afaf09c67 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java
@@ -64,7 +64,7 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
    * Tests log command with the usage of a default branch.
    */
   @Test
-  public void testGetDefaultBranch() throws Exception {
+  public void testGetDefaultBranch() {
     // without default branch, the repository head should be used
     ChangesetPagingResult result = createCommand().getChangesets(new LogCommandRequest());
 
@@ -92,7 +92,7 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
   }
 
   @Test
-  public void testGetAll() throws Exception
+  public void testGetAll()
   {
     ChangesetPagingResult result =
       createCommand().getChangesets(new LogCommandRequest());
@@ -103,7 +103,7 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
   }
 
   @Test
-  public void testGetAllByPath() throws Exception
+  public void testGetAllByPath()
   {
     LogCommandRequest request = new LogCommandRequest();
 
@@ -119,7 +119,7 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
   }
 
   @Test
-  public void testGetAllWithLimit() throws Exception
+  public void testGetAllWithLimit()
   {
     LogCommandRequest request = new LogCommandRequest();
 
@@ -143,7 +143,7 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
   }
 
   @Test
-  public void testGetAllWithPaging() throws Exception
+  public void testGetAllWithPaging()
   {
     LogCommandRequest request = new LogCommandRequest();
 
@@ -194,7 +194,7 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
   }
 
   @Test
-  public void testGetRange() throws Exception
+  public void testGetRange()
   {
     LogCommandRequest request = new LogCommandRequest();
 
@@ -216,6 +216,26 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
     assertEquals("435df2f061add3589cb326cc64be9b9c3897ceca", c2.getId());
   }
 
+  @Test
+  public void testGetAncestor()
+  {
+    LogCommandRequest request = new LogCommandRequest();
+
+    request.setBranch("test-branch");
+    request.setAncestorChangeset("master");
+
+    ChangesetPagingResult result = createCommand().getChangesets(request);
+
+    assertNotNull(result);
+    assertEquals(1, result.getTotal());
+    assertEquals(1, result.getChangesets().size());
+
+    Changeset c = result.getChangesets().get(0);
+
+    assertNotNull(c);
+    assertEquals("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4", c.getId());
+  }
+
   @Test
   public void shouldFindDefaultBranchFromHEAD() throws Exception {
     setRepositoryHeadReference("ref: refs/heads/test-branch");

From 1a3506ce50d9ef77663bef3d5bbd5381f642fe23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 5 Nov 2018 16:43:42 +0100
Subject: [PATCH 098/188] remove todo

---
 scm-ui/src/users/components/SetUserPassword.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scm-ui/src/users/components/SetUserPassword.js b/scm-ui/src/users/components/SetUserPassword.js
index a4a91c4083..dd826c2b90 100644
--- a/scm-ui/src/users/components/SetUserPassword.js
+++ b/scm-ui/src/users/components/SetUserPassword.js
@@ -74,7 +74,6 @@ class SetUserPassword extends React.Component<Props, State> {
   };
 
   submit = (event: Event) => {
-    //TODO: set loading
     event.preventDefault();
     if (this.isValid()) {
       const { user } = this.props;

From 7ef9db0fe51fbbd0ca131757efdc02d299770db7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 5 Nov 2018 18:09:18 +0100
Subject: [PATCH 099/188] Add changeset diff endpoint

---
 .../api/v2/resources/BranchRootResource.java  | 45 +++++++++++++++++++
 .../v2/resources/BranchToBranchDtoMapper.java |  1 +
 .../scm/api/v2/resources/ResourceLinks.java   |  4 ++
 3 files changed, 50 insertions(+)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java
index 5f57d1bcc8..431e39e759 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java
@@ -5,6 +5,7 @@ import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
 import sonia.scm.NotFoundException;
 import sonia.scm.PageResult;
+import sonia.scm.repository.Branch;
 import sonia.scm.repository.Branches;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
@@ -26,6 +27,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
+import java.util.List;
 
 public class BranchRootResource {
 
@@ -124,6 +126,49 @@ public class BranchRootResource {
     }
   }
 
+  @Path("{branch}/diffchangesets/{otherBranchName}")
+  @GET
+  @StatusCodes({
+    @ResponseCode(code = 200, condition = "success"),
+    @ResponseCode(code = 401, condition = "not authenticated / invalid credentials"),
+    @ResponseCode(code = 403, condition = "not authorized, the current user has no privileges to read the changeset"),
+    @ResponseCode(code = 404, condition = "not found, no changesets available in the repository"),
+    @ResponseCode(code = 500, condition = "internal server error")
+  })
+  @Produces(VndMediaType.CHANGESET_COLLECTION)
+  @TypeHint(CollectionDto.class)
+  public Response changesetDiff(@PathParam("namespace") String namespace,
+                          @PathParam("name") String name,
+                          @PathParam("branch") String branchName,
+                          @PathParam("otherBranchName") String otherBranchName,
+                          @DefaultValue("0") @QueryParam("page") int page,
+                          @DefaultValue("10") @QueryParam("pageSize") int pageSize) throws Exception {
+    try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
+      List<Branch> allBranches = repositoryService.getBranchesCommand().getBranches().getBranches();
+      if (allBranches.stream().noneMatch(branch -> branchName.equals(branch.getName()))) {
+        throw new NotFoundException("branch", branchName);
+      }
+      if (allBranches.stream().noneMatch(branch -> otherBranchName.equals(branch.getName()))) {
+        throw new NotFoundException("branch", otherBranchName);
+      }
+      Repository repository = repositoryService.getRepository();
+      RepositoryPermissions.read(repository).check();
+      ChangesetPagingResult changesets = new PagedLogCommandBuilder(repositoryService)
+        .page(page)
+        .pageSize(pageSize)
+        .create()
+        .setBranch(branchName)
+        .setAncestorChangeset(otherBranchName)
+        .getChangesets();
+      if (changesets != null && changesets.getChangesets() != null) {
+        PageResult<Changeset> pageResult = new PageResult<>(changesets.getChangesets(), changesets.getTotal());
+        return Response.ok(branchChangesetCollectionToDtoMapper.map(page, pageSize, pageResult, repository, branchName)).build();
+      } else {
+        return Response.ok().build();
+      }
+    }
+  }
+
   /**
    * Returns the branches for a repository.
    *
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapper.java
index 7ab3ef25a8..8167e28f9a 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapper.java
@@ -28,6 +28,7 @@ public abstract class BranchToBranchDtoMapper {
     Links.Builder linksBuilder = linkingTo()
       .self(resourceLinks.branch().self(namespaceAndName, target.getName()))
       .single(linkBuilder("history", resourceLinks.branch().history(namespaceAndName, target.getName())).build())
+      .single(linkBuilder("changesetDiff", resourceLinks.branch().changesetDiff(namespaceAndName, target.getName())).build())
       .single(linkBuilder("changeset", resourceLinks.changeset().changeset(namespaceAndName.getNamespace(), namespaceAndName.getName(), target.getRevision())).build())
       .single(linkBuilder("source", resourceLinks.source().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), target.getRevision())).build());
     target.add(linksBuilder.build());
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
index 1b397480a4..970166257a 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
@@ -322,6 +322,10 @@ class ResourceLinks {
     public String history(NamespaceAndName namespaceAndName, String branch) {
       return branchLinkBuilder.method("getRepositoryResource").parameters(namespaceAndName.getNamespace(), namespaceAndName.getName()).method("branches").parameters().method("history").parameters(branch).href();
     }
+
+    public String changesetDiff(NamespaceAndName namespaceAndName, String branch) {
+      return branchLinkBuilder.method("getRepositoryResource").parameters(namespaceAndName.getNamespace(), namespaceAndName.getName()).method("branches").parameters().method("changesetDiff").parameters(branch, "").href() + "{otherBranch}";
+    }
   }
 
   public BranchCollectionLinks branchCollection() {

From dd95c9c306b5433b5cdeb261aa40a4d9ced0e6b6 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 6 Nov 2018 07:59:34 +0100
Subject: [PATCH 100/188] implemented git repository type configuration

---
 scm-plugins/scm-git-plugin/package.json       |    2 +-
 .../scm/repository/GitRepositoryHandler.java  |   13 +-
 .../src/main/js/GitConfiguration.js           |  183 +++
 .../src/main/js/GitConfigurationNavLink.js    |   21 +
 .../src/main/js/GitConfigurationRoute.js      |   25 +
 .../scm-git-plugin/src/main/js/index.js       |   13 +
 .../main/resources/locales/en/plugins.json    |   11 +
 scm-plugins/scm-git-plugin/yarn.lock          |    6 +-
 scm-plugins/scm-hg-plugin/package.json        |    2 +-
 scm-plugins/scm-hg-plugin/yarn.lock           |    7 +-
 scm-plugins/scm-svn-plugin/package.json       |    2 +-
 scm-plugins/scm-svn-plugin/yarn.lock          |    6 +-
 .../packages/ui-components/package.json       |    2 +-
 .../ui-components/src/forms/Checkbox.js       |    5 +-
 .../ui-components/src/forms/InputField.js     |    5 +-
 .../packages/ui-components/yarn.lock          |    6 +-
 .../packages/ui-types/package.json            |    2 +-
 scm-ui-components/packages/ui-types/yarn.lock |    6 +-
 scm-ui/package.json                           |    2 +-
 scm-ui/src/config/containers/Config.js        |   34 +-
 scm-ui/src/containers/Main.js                 |    1 -
 scm-ui/yarn.lock                              | 1335 +----------------
 22 files changed, 321 insertions(+), 1368 deletions(-)
 create mode 100644 scm-plugins/scm-git-plugin/src/main/js/GitConfiguration.js
 create mode 100644 scm-plugins/scm-git-plugin/src/main/js/GitConfigurationNavLink.js
 create mode 100644 scm-plugins/scm-git-plugin/src/main/js/GitConfigurationRoute.js

diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json
index 602d6d2ff0..2774af8b26 100644
--- a/scm-plugins/scm-git-plugin/package.json
+++ b/scm-plugins/scm-git-plugin/package.json
@@ -12,6 +12,6 @@
     "@scm-manager/ui-extensions": "^0.0.7"
   },
   "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.19"
+    "@scm-manager/ui-bundler": "^0.0.21"
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
index c3436c2395..7ebc9b6f45 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
@@ -116,17 +116,17 @@ public class GitRepositoryHandler
   public void init(SCMContextProvider context)
   {
     super.init(context);
-    scheduleGc();
+    scheduleGc(getConfig().getGcExpression());
   }
 
   @Override
   public void setConfig(GitConfig config)
   {
+    scheduleGc(config.getGcExpression());
     super.setConfig(config);
-    scheduleGc();
   }
   
-  private void scheduleGc()
+  private void scheduleGc(String expression)
   {
     synchronized (LOCK){
       if ( task != null ){
@@ -134,11 +134,10 @@ public class GitRepositoryHandler
         task.cancel();
         task = null;
       }
-      String exp = getConfig().getGcExpression();
-      if (!Strings.isNullOrEmpty(exp))
+      if (!Strings.isNullOrEmpty(expression))
       {
-        logger.info("schedule git gc task with expression {}", exp);
-        task = scheduler.schedule(exp, GitGcTask.class);
+        logger.info("schedule git gc task with expression {}", expression);
+        task = scheduler.schedule(expression, GitGcTask.class);
       }
     }
   }
diff --git a/scm-plugins/scm-git-plugin/src/main/js/GitConfiguration.js b/scm-plugins/scm-git-plugin/src/main/js/GitConfiguration.js
new file mode 100644
index 0000000000..d886256d32
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/js/GitConfiguration.js
@@ -0,0 +1,183 @@
+//@flow
+import React from "react";
+import { translate } from "react-i18next";
+import type { Links } from "@scm-manager/ui-types";
+import {
+  apiClient,
+  Title,
+  InputField,
+  Checkbox,
+  SubmitButton,
+  Loading,
+  ErrorNotification
+} from "@scm-manager/ui-components";
+
+type Props = {
+  url: string,
+
+  // context props
+  t: (string) => string
+};
+
+type Configuration = {
+  repositoryDirectory?: string,
+  gcExpression?: string,
+  disabled: boolean,
+  _links?: Links
+}
+
+type State = Configuration & {
+  error?: Error,
+  fetching: boolean,
+  modifying: boolean
+};
+
+class GitConfiguration extends React.Component<Props, State> {
+
+  constructor(props: Props) {
+    super(props);
+    this.state = {
+      disabled: false,
+      fetching: true,
+      modifying: false
+    };
+  }
+
+  componentDidMount() {
+    const { url } = this.props;
+
+    // TODO capture content-type for sending
+
+    apiClient.get(url)
+      .then(response => response.json())
+      .then(this.loadConfig)
+      .catch(this.handleError);
+  }
+
+  handleError = (error: Error) => {
+    this.setState({
+      error,
+      fetching: false,
+      modifying: false
+    });
+  };
+
+  loadConfig = (configuration: Configuration) => {
+    this.setState({
+      ...configuration,
+      fetching: false,
+      error: undefined
+    });
+  };
+
+  handleInputChange = (value: string, name: string) => {
+    this.setState({
+      [name]: value
+    });
+  };
+
+  handleCheckboxChange = (value: boolean, name: string) => {
+    this.setState({
+      [name]: value
+    });
+  };
+
+  isValid = (): boolean => {
+    const { repositoryDirectory } = this.state;
+    return !!repositoryDirectory;
+  };
+
+  getModificationUrl = (): ?string => {
+    const links = this.state._links;
+    if (links && links.update) {
+      return links.update.href;
+    }
+  };
+
+  isReadOnly = (): boolean => {
+    const links = this.state._links;
+    return !links || !links.update;
+  };
+
+  render() {
+    const { fetching, error } = this.state;
+
+    if (error) {
+      return this.renderWithFrame(<ErrorNotification error={error}/>);
+    } else if (fetching) {
+      return this.renderWithFrame(<Loading/>);
+    }
+
+    return this.renderForm();
+  }
+
+  renderWithFrame(child) {
+    const { t } = this.props;
+    return (
+      <div>
+        <Title title={t("scm-git-plugin.config.title")}/>
+        {child}
+      </div>
+    );
+  }
+
+  modifyConfiguration = (event: Event) => {
+    event.preventDefault();
+
+    this.setState({ modifying: true });
+
+    const { repositoryDirectory, gcExpression, disabled } = this.state;
+
+    const configuration = {
+      repositoryDirectory,
+      gcExpression,
+      disabled
+    };
+
+    apiClient.put(this.getModificationUrl(), configuration, "application/vnd.scmm-gitconfig+json;v=2")
+      .then(() => this.setState({ modifying: false }))
+      .catch(this.handleError);
+  };
+
+  renderForm() {
+    const { repositoryDirectory, gcExpression, disabled, modifying } = this.state;
+
+    const { t } = this.props;
+    const readOnly = this.isReadOnly();
+
+    return this.renderWithFrame(
+      <form onSubmit={this.modifyConfiguration}>
+        <InputField name="repositoryDirectory"
+                    label={t("scm-git-plugin.config.directory")}
+                    helpText={t("scm-git-plugin.config.directoryHelpText")}
+                    value={repositoryDirectory}
+                    onChange={this.handleInputChange}
+                    disabled={readOnly}
+        />
+        <InputField name="gcExpression"
+                    label={t("scm-git-plugin.config.gcExpression")}
+                    helpText={t("scm-git-plugin.config.gcExpressionHelpText")}
+                    value={gcExpression}
+                    onChange={this.handleInputChange}
+                    disabled={readOnly}
+        />
+        <Checkbox name="disabled"
+                  label={t("scm-git-plugin.config.disabled")}
+                  helpText={t("scm-git-plugin.config.disabledHelpText")}
+                  checked={disabled}
+                  onChange={this.handleCheckboxChange}
+                  disabled={readOnly}
+        />
+        <hr/>
+        <SubmitButton
+          label={t("scm-git-plugin.config.submit")}
+          disabled={!this.isValid() || readOnly}
+          loading={modifying}
+        />
+      </form>
+    );
+  }
+
+}
+
+export default translate("plugins")(GitConfiguration);
diff --git a/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationNavLink.js b/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationNavLink.js
new file mode 100644
index 0000000000..5c8375bc25
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationNavLink.js
@@ -0,0 +1,21 @@
+//@flow
+import React from "react";
+import { NavLink } from "@scm-manager/ui-components";
+import { translate } from "react-i18next";
+
+type Props = {
+  url: string,
+
+  // context props
+  t: (string) => string
+}
+class GitConfigurationNavLink extends React.Component<Props> {
+
+  render() {
+    const { url, t } = this.props;
+    return <NavLink to={`${url}/git`} label={t("scm-git-plugin.config.link")} />;
+  }
+
+}
+
+export default translate("plugins")(GitConfigurationNavLink);
diff --git a/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationRoute.js b/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationRoute.js
new file mode 100644
index 0000000000..3d183e3ee9
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationRoute.js
@@ -0,0 +1,25 @@
+//@flow
+import React from "react";
+import type { Links } from "@scm-manager/ui-types";
+import GitConfiguration from "./GitConfiguration";
+import { Route } from "react-router-dom";
+
+type Props = {
+  url: string,
+  links: Links
+}
+
+class GitConfigurationRoute extends React.Component<Props> {
+
+  render() {
+    const { url, links } = this.props;
+
+    const configLink = links["gitConfig"].href;
+    return <Route path={url + "/git"}
+                  component={() => <GitConfiguration url={configLink} />}
+                  exact />;
+  }
+
+}
+
+export default GitConfigurationRoute;
diff --git a/scm-plugins/scm-git-plugin/src/main/js/index.js b/scm-plugins/scm-git-plugin/src/main/js/index.js
index be40135f8d..815f016b88 100644
--- a/scm-plugins/scm-git-plugin/src/main/js/index.js
+++ b/scm-plugins/scm-git-plugin/src/main/js/index.js
@@ -2,6 +2,10 @@
 import { binder } from "@scm-manager/ui-extensions";
 import ProtocolInformation from "./ProtocolInformation";
 import GitAvatar from "./GitAvatar";
+import GitConfigurationNavLink from "./GitConfigurationNavLink";
+import GitConfigurationRoute from "./GitConfigurationRoute";
+
+// repository
 
 const gitPredicate = (props: Object) => {
   return props.repository && props.repository.type === "git";
@@ -9,3 +13,12 @@ const gitPredicate = (props: Object) => {
 
 binder.bind("repos.repository-details.information", ProtocolInformation, gitPredicate);
 binder.bind("repos.repository-avatar", GitAvatar, gitPredicate);
+
+// global config
+
+const gitConfigPredicate = (props: Object) => {
+  return props.links && props.links["gitConfig"];
+};
+
+binder.bind("config.navigation", GitConfigurationNavLink, gitConfigPredicate);
+binder.bind("config.route", GitConfigurationRoute, gitConfigPredicate);
diff --git a/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json b/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
index 65594bae19..8cb801ac2c 100644
--- a/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
+++ b/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
@@ -4,6 +4,17 @@
       "clone" : "Clone the repository",
       "create" : "Create a new repository",
       "replace" : "Push an existing repository"
+    },
+    "config": {
+      "link": "Git",
+      "title": "Git Configuration",
+      "directory": "Repository Directory",
+      "directoryHelpText": "Location of the Git repositories.",
+      "gcExpression": "GC Cron Expression",
+      "gcExpressionHelpText": "Use Quartz Cron Expressions (SECOND MINUTE HOUR DAYOFMONTH MONTH DAYOFWEEK) to run git gc in intervals.",
+      "disabled": "Disabled",
+      "disabledHelpText": "Enable or disable the Git plugin",
+      "submit": "Submit"
     }
   }
 }
diff --git a/scm-plugins/scm-git-plugin/yarn.lock b/scm-plugins/scm-git-plugin/yarn.lock
index b85f672a8e..1313cbc62c 100644
--- a/scm-plugins/scm-git-plugin/yarn.lock
+++ b/scm-plugins/scm-git-plugin/yarn.lock
@@ -707,9 +707,9 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
 
-"@scm-manager/ui-bundler@^0.0.19":
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.19.tgz#646ab1fa1e5389fad614542215c60678fb9816ae"
+"@scm-manager/ui-bundler@^0.0.21":
+  version "0.0.21"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.21.tgz#f8b5fa355415cc67b8aaf8744e1701a299dff647"
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json
index 1398432412..0b18c7028d 100644
--- a/scm-plugins/scm-hg-plugin/package.json
+++ b/scm-plugins/scm-hg-plugin/package.json
@@ -9,6 +9,6 @@
     "@scm-manager/ui-extensions": "^0.0.7"
   },
   "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.19"
+    "@scm-manager/ui-bundler": "^0.0.21"
   }
 }
diff --git a/scm-plugins/scm-hg-plugin/yarn.lock b/scm-plugins/scm-hg-plugin/yarn.lock
index 70d4169198..690432612c 100644
--- a/scm-plugins/scm-hg-plugin/yarn.lock
+++ b/scm-plugins/scm-hg-plugin/yarn.lock
@@ -641,9 +641,9 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
 
-"@scm-manager/ui-bundler@^0.0.19":
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.19.tgz#646ab1fa1e5389fad614542215c60678fb9816ae"
+"@scm-manager/ui-bundler@^0.0.21":
+  version "0.0.21"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.21.tgz#f8b5fa355415cc67b8aaf8744e1701a299dff647"
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
@@ -660,7 +660,6 @@
     browserify-css "^0.14.0"
     colors "^1.3.1"
     commander "^2.17.1"
-    connect-history-api-fallback "^1.5.0"
     eslint "^5.4.0"
     eslint-config-react-app "^2.1.0"
     eslint-plugin-flowtype "^2.50.0"
diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json
index 1798c0b2e5..732e244113 100644
--- a/scm-plugins/scm-svn-plugin/package.json
+++ b/scm-plugins/scm-svn-plugin/package.json
@@ -9,6 +9,6 @@
     "@scm-manager/ui-extensions": "^0.0.7"
   },
   "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.19"
+    "@scm-manager/ui-bundler": "^0.0.21"
   }
 }
diff --git a/scm-plugins/scm-svn-plugin/yarn.lock b/scm-plugins/scm-svn-plugin/yarn.lock
index 977d642f6f..690432612c 100644
--- a/scm-plugins/scm-svn-plugin/yarn.lock
+++ b/scm-plugins/scm-svn-plugin/yarn.lock
@@ -641,9 +641,9 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
 
-"@scm-manager/ui-bundler@^0.0.19":
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.19.tgz#646ab1fa1e5389fad614542215c60678fb9816ae"
+"@scm-manager/ui-bundler@^0.0.21":
+  version "0.0.21"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.21.tgz#f8b5fa355415cc67b8aaf8744e1701a299dff647"
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
diff --git a/scm-ui-components/packages/ui-components/package.json b/scm-ui-components/packages/ui-components/package.json
index 3d52d16173..1288448908 100644
--- a/scm-ui-components/packages/ui-components/package.json
+++ b/scm-ui-components/packages/ui-components/package.json
@@ -12,7 +12,7 @@
     "eslint-fix": "eslint src --fix"
   },
   "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.19",
+    "@scm-manager/ui-bundler": "^0.0.21",
     "create-index": "^2.3.0",
     "enzyme": "^3.5.0",
     "enzyme-adapter-react-16": "^1.3.1",
diff --git a/scm-ui-components/packages/ui-components/src/forms/Checkbox.js b/scm-ui-components/packages/ui-components/src/forms/Checkbox.js
index 331b921d01..7db35958d5 100644
--- a/scm-ui-components/packages/ui-components/src/forms/Checkbox.js
+++ b/scm-ui-components/packages/ui-components/src/forms/Checkbox.js
@@ -4,15 +4,16 @@ import { Help } from "../index";
 
 type Props = {
   label?: string,
+  name?: string,
   checked: boolean,
-  onChange?: boolean => void,
+  onChange?: (value: boolean, name?: string) => void,
   disabled?: boolean,
   helpText?: string
 };
 class Checkbox extends React.Component<Props> {
   onCheckboxChange = (event: SyntheticInputEvent<HTMLInputElement>) => {
     if (this.props.onChange) {
-      this.props.onChange(event.target.checked);
+      this.props.onChange(event.target.checked, this.props.name);
     }
   };
 
diff --git a/scm-ui-components/packages/ui-components/src/forms/InputField.js b/scm-ui-components/packages/ui-components/src/forms/InputField.js
index 79b71298f8..32c419f6c5 100644
--- a/scm-ui-components/packages/ui-components/src/forms/InputField.js
+++ b/scm-ui-components/packages/ui-components/src/forms/InputField.js
@@ -5,11 +5,12 @@ import { LabelWithHelpIcon } from "../index";
 
 type Props = {
   label?: string,
+  name?: string,
   placeholder?: string,
   value?: string,
   type?: string,
   autofocus?: boolean,
-  onChange: string => void,
+  onChange: (value: string, name?: string) => void,
   onReturnPressed?: () => void,
   validationError: boolean,
   errorMessage: string,
@@ -32,7 +33,7 @@ class InputField extends React.Component<Props> {
   }
 
   handleInput = (event: SyntheticInputEvent<HTMLInputElement>) => {
-    this.props.onChange(event.target.value);
+    this.props.onChange(event.target.value, this.props.name);
   };
 
   handleKeyPress = (event: SyntheticKeyboardEvent<HTMLInputElement>) => {
diff --git a/scm-ui-components/packages/ui-components/yarn.lock b/scm-ui-components/packages/ui-components/yarn.lock
index 0200fdd1bf..49f638e049 100644
--- a/scm-ui-components/packages/ui-components/yarn.lock
+++ b/scm-ui-components/packages/ui-components/yarn.lock
@@ -641,9 +641,9 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
 
-"@scm-manager/ui-bundler@^0.0.19":
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.19.tgz#646ab1fa1e5389fad614542215c60678fb9816ae"
+"@scm-manager/ui-bundler@^0.0.21":
+  version "0.0.21"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.21.tgz#f8b5fa355415cc67b8aaf8744e1701a299dff647"
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
diff --git a/scm-ui-components/packages/ui-types/package.json b/scm-ui-components/packages/ui-types/package.json
index 122b1ba504..3e61b9ab32 100644
--- a/scm-ui-components/packages/ui-types/package.json
+++ b/scm-ui-components/packages/ui-types/package.json
@@ -14,7 +14,7 @@
     "check": "flow check"
   },
   "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.19"
+    "@scm-manager/ui-bundler": "^0.0.21"
   },
   "browserify": {
     "transform": [
diff --git a/scm-ui-components/packages/ui-types/yarn.lock b/scm-ui-components/packages/ui-types/yarn.lock
index 4f7257e8bb..fe2df2f76a 100644
--- a/scm-ui-components/packages/ui-types/yarn.lock
+++ b/scm-ui-components/packages/ui-types/yarn.lock
@@ -707,9 +707,9 @@
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
 
-"@scm-manager/ui-bundler@^0.0.19":
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.19.tgz#646ab1fa1e5389fad614542215c60678fb9816ae"
+"@scm-manager/ui-bundler@^0.0.21":
+  version "0.0.21"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.21.tgz#f8b5fa355415cc67b8aaf8744e1701a299dff647"
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
diff --git a/scm-ui/package.json b/scm-ui/package.json
index 69ca90a5af..219e173ca6 100644
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -48,7 +48,7 @@
     "pre-commit": "jest && flow && eslint src"
   },
   "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.19",
+    "@scm-manager/ui-bundler": "^0.0.21",
     "copyfiles": "^2.0.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
diff --git a/scm-ui/src/config/containers/Config.js b/scm-ui/src/config/containers/Config.js
index bc973bb925..6d935fe33a 100644
--- a/scm-ui/src/config/containers/Config.js
+++ b/scm-ui/src/config/containers/Config.js
@@ -2,12 +2,19 @@
 import React from "react";
 import { translate } from "react-i18next";
 import { Route } from "react-router";
+import { ExtensionPoint } from "@scm-manager/ui-extensions";
 
+import type { Links } from "@scm-manager/ui-types";
 import { Page, Navigation, NavLink, Section } from "@scm-manager/ui-components";
 import GlobalConfig from "./GlobalConfig";
 import type { History } from "history";
+import {connect} from "react-redux";
+import {compose} from "redux";
+import { getLinks } from "../../modules/indexResource";
 
 type Props = {
+  links: Links,
+
   // context objects
   t: string => string,
   match: any,
@@ -27,15 +34,23 @@ class Config extends React.Component<Props> {
   };
 
   render() {
-    const { t } = this.props;
+    const { links, t } = this.props;
 
     const url = this.matchedUrl();
+    const extensionProps = {
+      links,
+      url
+    };
 
     return (
       <Page>
         <div className="columns">
           <div className="column is-three-quarters">
             <Route path={url} exact component={GlobalConfig} />
+            <ExtensionPoint name="config.route"
+                            props={extensionProps}
+                            renderAll={true}
+            />
           </div>
           <div className="column">
             <Navigation>
@@ -44,6 +59,10 @@ class Config extends React.Component<Props> {
                   to={`${url}`}
                   label={t("global-config.navigation-label")}
                 />
+                <ExtensionPoint name="config.navigation"
+                                props={extensionProps}
+                                renderAll={true}
+                />
               </Section>
             </Navigation>
           </div>
@@ -53,4 +72,15 @@ class Config extends React.Component<Props> {
   }
 }
 
-export default translate("config")(Config);
+const mapStateToProps = (state: any) => {
+  const links = getLinks(state);
+  return {
+    links
+  };
+};
+
+export default compose(
+  connect(mapStateToProps),
+  translate("config")
+)(Config);
+
diff --git a/scm-ui/src/containers/Main.js b/scm-ui/src/containers/Main.js
index a971bab54d..aa4a289ad4 100644
--- a/scm-ui/src/containers/Main.js
+++ b/scm-ui/src/containers/Main.js
@@ -101,7 +101,6 @@ class Main extends React.Component<Props> {
             authenticated={authenticated}
           />
           <ProtectedRoute
-            exact
             path="/config"
             component={Config}
             authenticated={authenticated}
diff --git a/scm-ui/yarn.lock b/scm-ui/yarn.lock
index adfc1a3265..bf2d8c6a1d 100644
--- a/scm-ui/yarn.lock
+++ b/scm-ui/yarn.lock
@@ -5,14 +5,12 @@
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
-  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
   dependencies:
     "@babel/highlight" "^7.0.0"
 
 "@babel/core@^7.0.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.2.tgz#f8d2a9ceb6832887329a7b60f9d035791400ba4e"
-  integrity sha512-IFeSSnjXdhDaoysIlev//UzHZbdEmm7D0EIH2qtse9xK7mXEZQpYjs2P00XlP1qYsYvid79p+Zgg6tz1mp6iVw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.1.2"
@@ -32,7 +30,6 @@
 "@babel/generator@^7.0.0", "@babel/generator@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.2.tgz#fde75c072575ce7abbd97322e8fef5bae67e4630"
-  integrity sha512-70A9HWLS/1RHk3Ck8tNHKxOoKQuSKocYgwDN85Pyl/RBduss6AKxUR7RIZ/lzduQMSYfWEM4DDBu6A+XGbkFig==
   dependencies:
     "@babel/types" "^7.1.2"
     jsesc "^2.5.1"
@@ -43,14 +40,12 @@
 "@babel/helper-annotate-as-pure@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
-  integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
-  integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==
   dependencies:
     "@babel/helper-explode-assignable-expression" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -58,7 +53,6 @@
 "@babel/helper-builder-react-jsx@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0.tgz#fa154cb53eb918cf2a9a7ce928e29eb649c5acdb"
-  integrity sha512-ebJ2JM6NAKW0fQEqN8hOLxK84RbRz9OkUhGS/Xd5u56ejMfVbayJ4+LykERZCOUM6faa6Fp3SZNX3fcT16MKHw==
   dependencies:
     "@babel/types" "^7.0.0"
     esutils "^2.0.0"
@@ -66,7 +60,6 @@
 "@babel/helper-call-delegate@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
-  integrity sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.0.0"
     "@babel/traverse" "^7.1.0"
@@ -75,7 +68,6 @@
 "@babel/helper-define-map@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
-  integrity sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -84,7 +76,6 @@
 "@babel/helper-explode-assignable-expression@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
-  integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==
   dependencies:
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -92,7 +83,6 @@
 "@babel/helper-function-name@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
-  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
   dependencies:
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/template" "^7.1.0"
@@ -101,35 +91,30 @@
 "@babel/helper-get-function-arity@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
-  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-hoist-variables@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
-  integrity sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-member-expression-to-functions@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f"
-  integrity sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-module-imports@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
-  integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-module-transforms@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.1.0.tgz#470d4f9676d9fad50b324cdcce5fbabbc3da5787"
-  integrity sha512-0JZRd2yhawo79Rcm4w0LwSMILFmFXjugG3yqf+P/UsKsRS1mJCmMwwlHDlMg7Avr9LrvSpp4ZSULO9r8jpCzcw==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
@@ -141,26 +126,22 @@
 "@babel/helper-optimise-call-expression@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
-  integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-plugin-utils@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
-  integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
 
 "@babel/helper-regex@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
-  integrity sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==
   dependencies:
     lodash "^4.17.10"
 
 "@babel/helper-remap-async-to-generator@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
-  integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-wrap-function" "^7.1.0"
@@ -171,7 +152,6 @@
 "@babel/helper-replace-supers@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.1.0.tgz#5fc31de522ec0ef0899dc9b3e7cf6a5dd655f362"
-  integrity sha512-BvcDWYZRWVuDeXTYZWxekQNO5D4kO55aArwZOTFXw6rlLQA8ZaDicJR1sO47h+HrnCiDFiww0fSPV0d713KBGQ==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
@@ -181,7 +161,6 @@
 "@babel/helper-simple-access@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
-  integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==
   dependencies:
     "@babel/template" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -189,14 +168,12 @@
 "@babel/helper-split-export-declaration@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
-  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-wrap-function@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz#8cf54e9190706067f016af8f75cb3df829cc8c66"
-  integrity sha512-R6HU3dete+rwsdAfrOzTlE9Mcpk4RjU3aX3gi9grtmugQY0u79X7eogUvfXA5sI81Mfq1cn6AgxihfN33STjJA==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/template" "^7.1.0"
@@ -206,7 +183,6 @@
 "@babel/helpers@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.2.tgz#ab752e8c35ef7d39987df4e8586c63b8846234b5"
-  integrity sha512-Myc3pUE8eswD73aWcartxB16K6CGmHDv9KxOmD2CeOs/FaEAQodr3VYGmlvOmog60vNQ2w8QbatuahepZwrHiA==
   dependencies:
     "@babel/template" "^7.1.2"
     "@babel/traverse" "^7.1.0"
@@ -215,7 +191,6 @@
 "@babel/highlight@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
-  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
@@ -224,12 +199,10 @@
 "@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.2.tgz#85c5c47af6d244fab77bce6b9bd830e38c978409"
-  integrity sha512-x5HFsW+E/nQalGMw7hu+fvPqnBeBaIr0lWJ2SG0PPL2j+Pm9lYvCrsZJGIgauPIENx0v10INIyFjmSNUD/gSqQ==
 
 "@babel/plugin-proposal-async-generator-functions@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.1.0.tgz#41c1a702e10081456e23a7b74d891922dd1bb6ce"
-  integrity sha512-Fq803F3Jcxo20MXUSDdmZZXrPe6BWyGcWBPPNB/M7WaUYESKDeKMOGIxEzQOjGSmW/NWb6UaPZrtTB2ekhB/ew==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-remap-async-to-generator" "^7.1.0"
@@ -238,7 +211,6 @@
 "@babel/plugin-proposal-class-properties@^7.0.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.1.0.tgz#9af01856b1241db60ec8838d84691aa0bd1e8df4"
-  integrity sha512-/PCJWN+CKt5v1xcGn4vnuu13QDoV+P7NcICP44BoonAJoPSGwVkgrXihFIQGiEjjPlUDBIw1cM7wYFLARS2/hw==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-member-expression-to-functions" "^7.0.0"
@@ -250,7 +222,6 @@
 "@babel/plugin-proposal-json-strings@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz#3b4d7b5cf51e1f2e70f52351d28d44fc2970d01e"
-  integrity sha512-kfVdUkIAGJIVmHmtS/40i/fg/AGnw/rsZBCaapY5yjeO5RA9m165Xbw9KMOu2nqXP5dTFjEjHdfNdoVcHv133Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.0.0"
@@ -258,7 +229,6 @@
 "@babel/plugin-proposal-object-rest-spread@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz#9a17b547f64d0676b6c9cecd4edf74a82ab85e7e"
-  integrity sha512-14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
@@ -266,7 +236,6 @@
 "@babel/plugin-proposal-optional-catch-binding@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz#b610d928fe551ff7117d42c8bb410eec312a6425"
-  integrity sha512-JPqAvLG1s13B/AuoBjdBYvn38RqW6n1TzrQO839/sIpqLpbnXKacsAgpZHzLD83Sm8SDXMkkrAvEnJ25+0yIpw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
@@ -274,7 +243,6 @@
 "@babel/plugin-proposal-unicode-property-regex@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz#498b39cd72536cd7c4b26177d030226eba08cd33"
-  integrity sha512-tM3icA6GhC3ch2SkmSxv7J/hCWKISzwycub6eGsDrFDgukD4dZ/I+x81XgW0YslS6mzNuQ1Cbzh5osjIMgepPQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -283,63 +251,54 @@
 "@babel/plugin-syntax-async-generators@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz#bf0891dcdbf59558359d0c626fdc9490e20bc13c"
-  integrity sha512-im7ged00ddGKAjcZgewXmp1vxSZQQywuQXe2B1A7kajjZmDeY/ekMPmWr9zJgveSaQH0k7BcGrojQhcK06l0zA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-class-properties@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0.tgz#e051af5d300cbfbcec4a7476e37a803489881634"
-  integrity sha512-cR12g0Qzn4sgkjrbrzWy2GE7m9vMl/sFkqZ3gIpAQdrvPDnLM8180i+ANDFIXfjHo9aqp0ccJlQ0QNZcFUbf9w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-flow@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.0.0.tgz#70638aeaad9ee426bc532e51523cff8ff02f6f17"
-  integrity sha512-zGcuZWiWWDa5qTZ6iAnpG0fnX/GOu49pGR5PFvkQ9GmKNaSphXQnlNXh/LG20sqWtNrx/eB6krzfEzcwvUyeFA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-json-strings@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz#0d259a68090e15b383ce3710e01d5b23f3770cbd"
-  integrity sha512-UlSfNydC+XLj4bw7ijpldc1uZ/HB84vw+U6BTuqMdIEmz/LDe63w/GHtpQMdXWdqQZFeAI9PjnHe/vDhwirhKA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-jsx@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0.tgz#034d5e2b4e14ccaea2e4c137af7e4afb39375ffd"
-  integrity sha512-PdmL2AoPsCLWxhIr3kG2+F9v4WH06Q3z+NoGVpQgnUNGcagXHq5sB3OXxkSahKq9TLdNMN/AJzFYSOo8UKDMHg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-object-rest-spread@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz#37d8fbcaf216bd658ea1aebbeb8b75e88ebc549b"
-  integrity sha512-5A0n4p6bIiVe5OvQPxBnesezsgFJdHhSs3uFSvaPdMqtsovajLZ+G2vZyvNe10EzJBWWo3AcHGKhAFUxqwp2dw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-optional-catch-binding@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz#886f72008b3a8b185977f7cb70713b45e51ee475"
-  integrity sha512-Wc+HVvwjcq5qBg1w5RG9o9RVzmCaAg/Vp0erHCKpAYV8La6I94o4GQAmFYNmkzoMO6gzoOSulpKeSSz6mPEoZw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-arrow-functions@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz#a6c14875848c68a3b4b3163a486535ef25c7e749"
-  integrity sha512-2EZDBl1WIO/q4DIkIp4s86sdp4ZifL51MoIviLY/gG/mLSuOIEg7J8o6mhbxOTvUJkaN50n+8u41FVsr5KLy/w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-async-to-generator@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.1.0.tgz#109e036496c51dd65857e16acab3bafdf3c57811"
-  integrity sha512-rNmcmoQ78IrvNCIt/R9U+cixUHeYAzgusTFgIAv+wQb9HJU4szhpDD6e5GCACmj/JP5KxuCwM96bX3L9v4ZN/g==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -348,14 +307,12 @@
 "@babel/plugin-transform-block-scoped-functions@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz#482b3f75103927e37288b3b67b65f848e2aa0d07"
-  integrity sha512-AOBiyUp7vYTqz2Jibe1UaAWL0Hl9JUXEgjFvvvcSc9MVDItv46ViXFw2F7SVt1B5k+KWjl44eeXOAk3UDEaJjQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-block-scoping@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0.tgz#1745075edffd7cdaf69fab2fb6f9694424b7e9bc"
-  integrity sha512-GWEMCrmHQcYWISilUrk9GDqH4enf3UmhOEbNbNrlNAX1ssH3MsS1xLOS6rdjRVPgA7XXVPn87tRkdTEoA/dxEg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.10"
@@ -363,7 +320,6 @@
 "@babel/plugin-transform-classes@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz#ab3f8a564361800cbc8ab1ca6f21108038432249"
-  integrity sha512-rNaqoD+4OCBZjM7VaskladgqnZ1LO6o2UxuWSDzljzW21pN1KXkB7BstAVweZdxQkHAujps5QMNOTWesBciKFg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-define-map" "^7.1.0"
@@ -377,21 +333,18 @@
 "@babel/plugin-transform-computed-properties@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz#2fbb8900cd3e8258f2a2ede909b90e7556185e31"
-  integrity sha512-ubouZdChNAv4AAWAgU7QKbB93NU5sHwInEWfp+/OzJKA02E6Woh9RVoX4sZrbRwtybky/d7baTUqwFx+HgbvMA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-destructuring@^7.0.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.1.2.tgz#5fa77d473f5a0a3f5266ad7ce2e8c995a164d60a"
-  integrity sha512-cvToXvp/OsYxtEn57XJu9BvsGSEYjAh9UeUuXpoi7x6QHB7YdWyQ4lRU/q0Fu1IJNT0o0u4FQ1DMQBzJ8/8vZg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-dotall-regex@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz#73a24da69bc3c370251f43a3d048198546115e58"
-  integrity sha512-00THs8eJxOJUFVx1w8i1MBF4XH4PsAjKjQ1eqN/uCH3YKwP21GCKfrn6YZFZswbOk9+0cw1zGQPHVc1KBlSxig==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -400,14 +353,12 @@
 "@babel/plugin-transform-duplicate-keys@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz#a0601e580991e7cace080e4cf919cfd58da74e86"
-  integrity sha512-w2vfPkMqRkdxx+C71ATLJG30PpwtTpW7DDdLqYt2acXU7YjztzeWW2Jk1T6hKqCLYCcEA5UQM/+xTAm+QCSnuQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-exponentiation-operator@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.1.0.tgz#9c34c2ee7fd77e02779cfa37e403a2e1003ccc73"
-  integrity sha512-uZt9kD1Pp/JubkukOGQml9tqAeI8NkE98oZnHZ2qHRElmeKCodbTZgOEUtujSCSLhHSBWbzNiFSDIMC4/RBTLQ==
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -415,7 +366,6 @@
 "@babel/plugin-transform-flow-strip-types@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0.tgz#c40ced34c2783985d90d9f9ac77a13e6fb396a01"
-  integrity sha512-WhXUNb4It5a19RsgKKbQPrjmy4yWOY1KynpEbNw7bnd1QTcrT/EIl3MJvnGgpgvrKyKbqX7nUNOJfkpLOnoDKA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-flow" "^7.0.0"
@@ -423,14 +373,12 @@
 "@babel/plugin-transform-for-of@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz#f2ba4eadb83bd17dc3c7e9b30f4707365e1c3e39"
-  integrity sha512-TlxKecN20X2tt2UEr2LNE6aqA0oPeMT1Y3cgz8k4Dn1j5ObT8M3nl9aA37LLklx0PBZKETC9ZAf9n/6SujTuXA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-function-name@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.1.0.tgz#29c5550d5c46208e7f730516d41eeddd4affadbb"
-  integrity sha512-VxOa1TMlFMtqPW2IDYZQaHsFrq/dDoIjgN098NowhexhZcz3UGlvPgZXuE1jEvNygyWyxRacqDpCZt+par1FNg==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -438,14 +386,12 @@
 "@babel/plugin-transform-literals@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz#2aec1d29cdd24c407359c930cdd89e914ee8ff86"
-  integrity sha512-1NTDBWkeNXgpUcyoVFxbr9hS57EpZYXpje92zv0SUzjdu3enaRwF/l3cmyRnXLtIdyJASyiS6PtybK+CgKf7jA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-modules-amd@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.1.0.tgz#f9e0a7072c12e296079b5a59f408ff5b97bf86a8"
-  integrity sha512-wt8P+xQ85rrnGNr2x1iV3DW32W8zrB6ctuBkYBbf5/ZzJY99Ob4MFgsZDFgczNU76iy9PWsy4EuxOliDjdKw6A==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -453,7 +399,6 @@
 "@babel/plugin-transform-modules-commonjs@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.1.0.tgz#0a9d86451cbbfb29bd15186306897c67f6f9a05c"
-  integrity sha512-wtNwtMjn1XGwM0AXPspQgvmE6msSJP15CX2RVfpTSTNPLhKhaOjaIfBaVfj4iUZ/VrFSodcFedwtPg/NxwQlPA==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -462,7 +407,6 @@
 "@babel/plugin-transform-modules-systemjs@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0.tgz#8873d876d4fee23209decc4d1feab8f198cf2df4"
-  integrity sha512-8EDKMAsitLkiF/D4Zhe9CHEE2XLh4bfLbb9/Zf3FgXYQOZyZYyg7EAel/aT2A7bHv62jwHf09q2KU/oEexr83g==
   dependencies:
     "@babel/helper-hoist-variables" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -470,7 +414,6 @@
 "@babel/plugin-transform-modules-umd@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.1.0.tgz#a29a7d85d6f28c3561c33964442257cc6a21f2a8"
-  integrity sha512-enrRtn5TfRhMmbRwm7F8qOj0qEYByqUvTttPEGimcBH4CJHphjyK1Vg7sdU7JjeEmgSpM890IT/efS2nMHwYig==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -478,14 +421,12 @@
 "@babel/plugin-transform-new-target@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
-  integrity sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-object-super@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.1.0.tgz#b1ae194a054b826d8d4ba7ca91486d4ada0f91bb"
-  integrity sha512-/O02Je1CRTSk2SSJaq0xjwQ8hG4zhZGNjE8psTsSNPXyLRCODv7/PBozqT5AmQMzp7MI3ndvMhGdqp9c96tTEw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-replace-supers" "^7.1.0"
@@ -493,7 +434,6 @@
 "@babel/plugin-transform-parameters@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.1.0.tgz#44f492f9d618c9124026e62301c296bf606a7aed"
-  integrity sha512-vHV7oxkEJ8IHxTfRr3hNGzV446GAb+0hgbA7o/0Jd76s+YzccdWuTU296FOCOl/xweU4t/Ya4g41yWz80RFCRw==
   dependencies:
     "@babel/helper-call-delegate" "^7.1.0"
     "@babel/helper-get-function-arity" "^7.0.0"
@@ -502,14 +442,12 @@
 "@babel/plugin-transform-react-display-name@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0.tgz#93759e6c023782e52c2da3b75eca60d4f10533ee"
-  integrity sha512-BX8xKuQTO0HzINxT6j/GiCwoJB0AOMs0HmLbEnAvcte8U8rSkNa/eSCAY+l1OA4JnCVq2jw2p6U8QQryy2fTPg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-react-jsx-self@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.0.0.tgz#a84bb70fea302d915ea81d9809e628266bb0bc11"
-  integrity sha512-pymy+AK12WO4safW1HmBpwagUQRl9cevNX+82AIAtU1pIdugqcH+nuYP03Ja6B+N4gliAaKWAegIBL/ymALPHA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.0.0"
@@ -517,7 +455,6 @@
 "@babel/plugin-transform-react-jsx-source@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0.tgz#28e00584f9598c0dd279f6280eee213fa0121c3c"
-  integrity sha512-OSeEpFJEH5dw/TtxTg4nijl4nHBbhqbKL94Xo/Y17WKIf2qJWeIk/QeXACF19lG1vMezkxqruwnTjVizaW7u7w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.0.0"
@@ -525,7 +462,6 @@
 "@babel/plugin-transform-react-jsx@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0.tgz#524379e4eca5363cd10c4446ba163f093da75f3e"
-  integrity sha512-0TMP21hXsSUjIQJmu/r7RiVxeFrXRcMUigbKu0BLegJK9PkYodHstaszcig7zxXfaBji2LYUdtqIkHs+hgYkJQ==
   dependencies:
     "@babel/helper-builder-react-jsx" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -534,28 +470,24 @@
 "@babel/plugin-transform-regenerator@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1"
-  integrity sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==
   dependencies:
     regenerator-transform "^0.13.3"
 
 "@babel/plugin-transform-shorthand-properties@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz#85f8af592dcc07647541a0350e8c95c7bf419d15"
-  integrity sha512-g/99LI4vm5iOf5r1Gdxq5Xmu91zvjhEG5+yZDJW268AZELAu4J1EiFLnkSG3yuUsZyOipVOVUKoGPYwfsTymhw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-spread@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz#93583ce48dd8c85e53f3a46056c856e4af30b49b"
-  integrity sha512-L702YFy2EvirrR4shTj0g2xQp7aNwZoWNCkNu2mcoU0uyzMl0XRwDSwzB/xp6DSUFiBmEXuyAyEN16LsgVqGGQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-sticky-regex@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz#30a9d64ac2ab46eec087b8530535becd90e73366"
-  integrity sha512-LFUToxiyS/WD+XEWpkx/XJBrUXKewSZpzX68s+yEOtIbdnsRjpryDw9U06gYc6klYEij/+KQVRnD3nz3AoKmjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -563,7 +495,6 @@
 "@babel/plugin-transform-template-literals@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz#084f1952efe5b153ddae69eb8945f882c7a97c65"
-  integrity sha512-vA6rkTCabRZu7Nbl9DfLZE1imj4tzdWcg5vtdQGvj+OH9itNNB6hxuRMHuIY8SGnEt1T9g5foqs9LnrHzsqEFg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -571,14 +502,12 @@
 "@babel/plugin-transform-typeof-symbol@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz#4dcf1e52e943e5267b7313bff347fdbe0f81cec9"
-  integrity sha512-1r1X5DO78WnaAIvs5uC48t41LLckxsYklJrZjNKcevyz83sF2l4RHbw29qrCPr/6ksFsdfRpT/ZgxNWHXRnffg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-unicode-regex@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz#c6780e5b1863a76fe792d90eded9fcd5b51d68fc"
-  integrity sha512-uJBrJhBOEa3D033P95nPHu3nbFwFE9ZgXsfEitzoIXIwqAZWk7uXcg06yFKXz9FSxBH5ucgU/cYdX0IV8ldHKw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
@@ -587,7 +516,6 @@
 "@babel/preset-env@^7.0.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.1.0.tgz#e67ea5b0441cfeab1d6f41e9b5c79798800e8d11"
-  integrity sha512-ZLVSynfAoDHB/34A17/JCZbyrzbQj59QC1Anyueb4Bwjh373nVPq5/HMph0z+tCmcDjXDe+DlKQq9ywQuvWrQg==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -634,7 +562,6 @@
 "@babel/preset-flow@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz#afd764835d9535ec63d8c7d4caf1c06457263da2"
-  integrity sha512-bJOHrYOPqJZCkPVbG1Lot2r5OSsB+iUOaxiHdlOeB1yPWS6evswVHwvkDLZ54WTaTRIk89ds0iHmGZSnxlPejQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-flow-strip-types" "^7.0.0"
@@ -642,7 +569,6 @@
 "@babel/preset-react@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"
-  integrity sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-react-display-name" "^7.0.0"
@@ -653,7 +579,6 @@
 "@babel/template@^7.1.0", "@babel/template@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
-  integrity sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.1.2"
@@ -662,7 +587,6 @@
 "@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.0.tgz#503ec6669387efd182c3888c4eec07bcc45d91b2"
-  integrity sha512-bwgln0FsMoxm3pLOgrrnGaXk18sSM9JNf1/nHC/FksmNGFbYnPWY4GYCfLxyP1KRmfsxqkRpfoa6xr6VuuSxdw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.0.0"
@@ -677,7 +601,6 @@
 "@babel/types@^7.0.0", "@babel/types@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.2.tgz#183e7952cf6691628afdc2e2b90d03240bac80c0"
-  integrity sha512-pb1I05sZEKiSlMUV9UReaqsCPUpgbHHHu2n1piRm7JkuBkm6QxcaIzKu6FMnMtCbih/cEYTR+RGYYC96Yk9HAg==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.10"
@@ -686,12 +609,10 @@
 "@fortawesome/fontawesome-free@^5.3.1":
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.3.1.tgz#5466b8f31c1f493a96754c1426c25796d0633dd9"
-  integrity sha512-jt6yi7iZVtkY9Jc6zFo+G2vqL4M81pb3IA3WmnnDt9ci7Asz+mPg4gbZL8pjx0nGFBsG0Bmd7BjU9IQkebqxFA==
 
 "@gulp-sourcemaps/identity-map@1.X":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz#1e6fe5d8027b1f285dc0d31762f566bccd73d5a9"
-  integrity sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==
   dependencies:
     acorn "^5.0.3"
     css "^2.2.1"
@@ -702,7 +623,6 @@
 "@gulp-sourcemaps/map-sources@1.X":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz#890ae7c5d8c877f6d384860215ace9d7ec945bda"
-  integrity sha1-iQrnxdjId/bThIYCFazp1+yUW9o=
   dependencies:
     normalize-path "^2.0.1"
     through2 "^2.0.3"
@@ -710,7 +630,6 @@
 "@octokit/rest@^15.2.6":
   version "15.13.0"
   resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-15.13.0.tgz#078262de2f1d1b02ead7a00c4a3870f517528bcb"
-  integrity sha512-zgsrqMCLcv4XqpT0QGUykHTvKo33aCVzXP86Bq6HmeKuwY6hEWJ+AVCeL/m3bXk1JBpLyBgzjJDfWEfZcqsR6g==
   dependencies:
     before-after-hook "^1.1.0"
     btoa-lite "^1.0.0"
@@ -725,12 +644,10 @@
 "@scm-manager/eslint-config@^0.0.2":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"
-  integrity sha512-0Xp8yMaK4RA7nxgF5/Q8hC7ATfwHZLtGogPeEAEHyT+HI5HqWeQpwd+vPuoD1QveoypNDjqDoctmFKdzi26Q+Q==
 
-"@scm-manager/ui-bundler@^0.0.19":
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.19.tgz#646ab1fa1e5389fad614542215c60678fb9816ae"
-  integrity sha512-k8Hp73HlF+Me3l0ZwmU0SPVadYgYSBL5/bE/9PASO+mdm7dfkjgPIvOPfdXT8GlWwzFt0RIk7ROMf4UEr7Q1ow==
+"@scm-manager/ui-bundler@^0.0.21":
+  version "0.0.21"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.21.tgz#f8b5fa355415cc67b8aaf8744e1701a299dff647"
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
@@ -771,7 +688,6 @@
 "@scm-manager/ui-extensions@^0.0.7":
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.0.7.tgz#a0a657a1410b78838ba0b36096ef631dca7fe27e"
-  integrity sha512-iL04lKHn+pfuh0KcOPjAbU9g5Ji0I6P0lOqiwYdVd+U9PjPuJDEjdMC4wNCPc5rMo9tSQdSwqvUtW4e5NjEbfg==
   dependencies:
     react "^16.4.2"
     react-dom "^16.4.2"
@@ -779,12 +695,10 @@
 "@types/node@*":
   version "10.11.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.11.4.tgz#e8bd933c3f78795d580ae41d86590bfc1f4f389d"
-  integrity sha512-ojnbBiKkZFYRfQpmtnnWTMw+rzGp/JiystjluW9jgN3VzRwilXddJ6aGQ9V/7iuDG06SBgn7ozW9k3zcAnYjYQ==
 
 JSONStream@^1.0.3:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
-  integrity sha512-Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -792,17 +706,14 @@ JSONStream@^1.0.3:
 abab@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
-  integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==
 
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 accepts@~1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
-  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
   dependencies:
     mime-types "~2.1.18"
     negotiator "0.6.1"
@@ -810,7 +721,6 @@ accepts@~1.3.4:
 acorn-globals@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz#e3b6f8da3c1552a95ae627571f7dd6923bb54103"
-  integrity sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==
   dependencies:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
@@ -818,14 +728,12 @@ acorn-globals@^4.1.0:
 acorn-jsx@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e"
-  integrity sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==
   dependencies:
     acorn "^5.0.3"
 
 acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.6.0.tgz#725c6b8b432451383b5d2816a18a5ab13288aa58"
-  integrity sha512-ZsysjEh+Y3i14f7YXCAKJy99RXbd56wHKYBzN4FlFtICIZyFpYwK6OwNJhcz8A/FMtxoUZkJofH1v9KIfNgWmw==
   dependencies:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
@@ -834,39 +742,32 @@ acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2:
 acorn-walk@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.0.tgz#c957f4a1460da46af4a0388ce28b4c99355b0cbc"
-  integrity sha512-ugTb7Lq7u4GfWSqqpwE0bGyoBZNMTok/zDBXxfEG0QM50jNlGhIWjRC1pPN7bvV1anhF+bs+/gNcRw+o55Evbg==
 
 acorn@5.X, acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.0:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
 acorn@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.2.tgz#6a459041c320ab17592c6317abbfdf4bbaa98ca4"
-  integrity sha512-GXmKIvbrN3TV7aVqAzVFaMW8F8wzVX7voEBRO3bDA64+EX37YSayggRJP5Xig6HYHBkWKpFg9W5gg6orklubhg==
 
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
 agent-base@4, agent-base@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
 ajv-keywords@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
-  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
 ajv@^5.1.0, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
@@ -876,7 +777,6 @@ ajv@^5.1.0, ajv@^5.3.0:
 ajv@^6.0.1, ajv@^6.5.3:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
-  integrity sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -886,51 +786,42 @@ ajv@^6.0.1, ajv@^6.5.3:
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
-  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
 
 ansi-gray@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
   dependencies:
     ansi-wrap "0.1.0"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-wrap@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
   dependencies:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
@@ -938,7 +829,6 @@ anymatch@^1.3.0:
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
@@ -946,24 +836,20 @@ anymatch@^2.0.0:
 append-transform@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
-  integrity sha1-126/jKlNJ24keja61EpLdKthGZE=
   dependencies:
     default-require-extensions "^1.0.0"
 
 aproba@^1.0.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 archy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
 
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -971,14 +857,12 @@ are-we-there-yet@~1.1.2:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 aria-query@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
-  integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=
   dependencies:
     ast-types-flow "0.0.7"
     commander "^2.11.0"
@@ -986,54 +870,44 @@ aria-query@^3.0.0:
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
 
 array-each@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
-  integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
 
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
-  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
 array-filter@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
-  integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
 
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
 array-includes@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
-  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.7.0"
@@ -1041,44 +915,36 @@ array-includes@^3.0.3:
 array-map@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
-  integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=
 
 array-reduce@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
-  integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
 
 array-slice@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
-  integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
 
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1, array-uniq@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 array.prototype.flat@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz#812db8f02cad24d3fab65dd67eabe3b8903494a4"
-  integrity sha512-rVqIs330nLJvfC7JqYvEWwqVr5QjYF1ib02i3YJtR/fICO6527Tjpc/e4Mvmxh3GIePPreRXMdaGyC99YphWEw==
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.10.0"
@@ -1087,17 +953,14 @@ array.prototype.flat@^1.2.1:
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
-  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -1106,103 +969,84 @@ asn1.js@^4.0.0:
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
 
 assert@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
   dependencies:
     util "0.10.3"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 ast-types-flow@0.0.7, ast-types-flow@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
-  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
 async-each-series@0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432"
-  integrity sha1-dhfBkXQB/Yykooqtzj266Yr+tDI=
 
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
 
 async-foreach@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
 async@1.5.2:
   version "1.5.2"
   resolved "http://registry.npmjs.org/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
 async@^2.1.4, async@^2.5.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
     lodash "^4.17.10"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
 
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.2.1, aws4@^1.6.0, aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 axios@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"
-  integrity sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0=
   dependencies:
     follow-redirects "^1.2.5"
     is-buffer "^1.1.5"
@@ -1210,14 +1054,12 @@ axios@0.17.1:
 axobject-query@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.1.tgz#05dfa705ada8ad9db993fa6896f22d395b0b0a07"
-  integrity sha1-Bd+nBa2orZ25k/polvItOVsLCgc=
   dependencies:
     ast-types-flow "0.0.7"
 
 babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -1226,7 +1068,6 @@ babel-code-frame@^6.26.0:
 babel-core@^6.0.0, babel-core@^6.26.0:
   version "6.26.3"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
-  integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
   dependencies:
     babel-code-frame "^6.26.0"
     babel-generator "^6.26.0"
@@ -1251,12 +1092,10 @@ babel-core@^6.0.0, babel-core@^6.26.0:
 babel-core@^7.0.0-0:
   version "7.0.0-bridge.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
-  integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
 
 babel-eslint@^9.0.0-beta.3:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-9.0.0.tgz#7d9445f81ed9f60aff38115f838970df9f2b6220"
-  integrity sha512-itv1MwE3TMbY0QtNfeL7wzak1mV47Uy+n6HtSOO4Xd7rvmO+tsGQSgyOEEgo6Y2vHZKZphaoelNeSVj4vkLA1g==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.0.0"
@@ -1268,7 +1107,6 @@ babel-eslint@^9.0.0-beta.3:
 babel-generator@^6.18.0, babel-generator@^6.26.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
-  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.26.0"
@@ -1282,7 +1120,6 @@ babel-generator@^6.18.0, babel-generator@^6.26.0:
 babel-helpers@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
-  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
   dependencies:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
@@ -1290,7 +1127,6 @@ babel-helpers@^6.24.1:
 babel-jest@^23.4.2, babel-jest@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.6.0.tgz#a644232366557a2240a0c083da6b25786185a2f1"
-  integrity sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==
   dependencies:
     babel-plugin-istanbul "^4.1.6"
     babel-preset-jest "^23.2.0"
@@ -1298,14 +1134,12 @@ babel-jest@^23.4.2, babel-jest@^23.6.0:
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-istanbul@^4.1.6:
   version "4.1.6"
   resolved "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
-  integrity sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.13.0"
     find-up "^2.1.0"
@@ -1315,17 +1149,14 @@ babel-plugin-istanbul@^4.1.6:
 babel-plugin-jest-hoist@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
-  integrity sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=
 
 babel-plugin-syntax-object-rest-spread@^6.13.0:
   version "6.13.0"
   resolved "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
-  integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
 
 babel-polyfill@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
-  integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
   dependencies:
     babel-runtime "^6.26.0"
     core-js "^2.5.0"
@@ -1334,7 +1165,6 @@ babel-polyfill@^6.26.0:
 babel-preset-jest@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
-  integrity sha1-jsegOhOPABoaj7HoETZSvxpV2kY=
   dependencies:
     babel-plugin-jest-hoist "^23.2.0"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
@@ -1342,7 +1172,6 @@ babel-preset-jest@^23.2.0:
 babel-register@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
-  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
   dependencies:
     babel-core "^6.26.0"
     babel-runtime "^6.26.0"
@@ -1355,7 +1184,6 @@ babel-register@^6.26.0:
 babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
@@ -1363,7 +1191,6 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
 babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
   dependencies:
     babel-runtime "^6.26.0"
     babel-traverse "^6.26.0"
@@ -1374,7 +1201,6 @@ babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
 babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
   dependencies:
     babel-code-frame "^6.26.0"
     babel-messages "^6.23.0"
@@ -1389,7 +1215,6 @@ babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.26.0:
 babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
   dependencies:
     babel-runtime "^6.26.0"
     esutils "^2.0.2"
@@ -1399,42 +1224,34 @@ babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.26.0:
 babelify@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/babelify/-/babelify-9.0.0.tgz#6b2e39ffeeda3765aee60eeb5b581fd947cc64ec"
-  integrity sha512-Q8rZxbkCo0BKQFp4JYWSt9lVYWDRyZPk5fsUr4PQguxGDN0XXVjHCr00WaKpdSUhGXSVYjIujXjtFzhwTGg8VA==
 
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
-  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@^1.0.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
 base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
-  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -1447,46 +1264,38 @@ base@^0.11.1:
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
 beeper@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
 
 before-after-hook@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.1.0.tgz#83165e15a59460d13702cb8febd6a1807896db5a"
-  integrity sha512-VOMDtYPwLbIncTxNoSzRyvaMxtXmLWLUqr8k5AfC1BzLk34HvBXaQX8snOwQZ4c0aX8aSERqtJSiI9/m2u5kuA==
 
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
-  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
   dependencies:
     callsite "1.0.0"
 
 big-integer@^1.6.17:
   version "1.6.36"
   resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.36.tgz#78631076265d4ae3555c04f85e7d9d2f3a071a36"
-  integrity sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg==
 
 binary-extensions@^1.0.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
-  integrity sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==
 
 binary@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79"
-  integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=
   dependencies:
     buffers "~0.1.1"
     chainsaw "~0.1.0"
@@ -1494,7 +1303,6 @@ binary@~0.3.0:
 bl@^1.2.1:
   version "1.2.2"
   resolved "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
-  integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
   dependencies:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
@@ -1502,46 +1310,38 @@ bl@^1.2.1:
 blob@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
-  integrity sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=
 
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
   dependencies:
     inherits "~2.0.0"
 
 bluebird@^3.3.3:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
-  integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
 
 bluebird@~3.4.1:
   version "3.4.7"
   resolved "http://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
-  integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
 boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 boom@2.x.x:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
   dependencies:
     hoek "2.x.x"
 
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -1549,7 +1349,6 @@ brace-expansion@^1.0.0, brace-expansion@^1.1.7:
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -1558,7 +1357,6 @@ braces@^1.8.2:
 braces@^2.3.0, braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -1574,17 +1372,14 @@ braces@^2.3.0, braces@^2.3.1:
 brcast@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/brcast/-/brcast-3.0.1.tgz#6256a8349b20de9eed44257a9b24d71493cd48dd"
-  integrity sha512-eI3yqf9YEqyGl9PCNTR46MGvDylGtaHjalcz6Q3fAPnP/PhpKkkve52vFdfGpwp4VUvK6LUr4TQN+2stCrEwTg==
 
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
 browser-pack@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.1.0.tgz#c34ba10d0b9ce162b5af227c7131c92c2ecd5774"
-  integrity sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==
   dependencies:
     JSONStream "^1.0.3"
     combine-source-map "~0.8.0"
@@ -1596,19 +1391,16 @@ browser-pack@^6.0.1:
 browser-process-hrtime@^0.1.2:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
-  integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
 
 browser-resolve@^1.11.0, browser-resolve@^1.11.3, browser-resolve@^1.7.0:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
-  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
   dependencies:
     resolve "1.1.7"
 
 browser-sync-client@^2.26.0:
   version "2.26.0"
   resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.26.0.tgz#ea8b38a251e8445177e23a0e37b68b1e4eeff0a0"
-  integrity sha512-XRVN6xNFCQYb5mjrDoVzdV2rBK6PMLtTeYkKcs5UPp+/cuviB8z8odaHx0Oe/cAs3Vl45csRdpa7T+q1Zf+6qQ==
   dependencies:
     mitt "^1.1.3"
     rxjs "^5.5.6"
@@ -1616,7 +1408,6 @@ browser-sync-client@^2.26.0:
 browser-sync-ui@^2.26.0:
   version "2.26.0"
   resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.26.0.tgz#8fd7ec972fc30288ca3706df6c3e79ef784710e5"
-  integrity sha512-7bXPmkQ9GuSPUgji3Nb4y0IL8wS2LfdrKSG28bQwvys5bs4kWyXDec2RkYBiupTTModM5lbwXgtmoh7GWQuLGg==
   dependencies:
     async-each-series "0.1.1"
     connect-history-api-fallback "^1"
@@ -1628,7 +1419,6 @@ browser-sync-ui@^2.26.0:
 browser-sync@^2.24.7:
   version "2.26.0"
   resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.26.0.tgz#63b401c51b715e85dc4df9ef1d135a63a6d3889e"
-  integrity sha512-/2f2/jPmFEdPw7wcARid/oGO237RMfZ8SyAYVtF4Zq5R/E+78zx/rH6aFc/UFY+VDHcsCqmDsfIEi/q1fA3l4Q==
   dependencies:
     browser-sync-client "^2.26.0"
     browser-sync-ui "^2.26.0"
@@ -1663,7 +1453,6 @@ browser-sync@^2.24.7:
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -1675,7 +1464,6 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
 browserify-cipher@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
@@ -1684,7 +1472,6 @@ browserify-cipher@^1.0.0:
 browserify-css@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/browserify-css/-/browserify-css-0.14.0.tgz#5ece581aa6f8c9aab262956fd06d57c526c9a334"
-  integrity sha512-FU1vG4kcXpdLwhhLL/VjULBsIdAFV7LbFjTNXoy6yf3omXNObDefZ8RSshUe6v8xwp7QyUENMVIiiOsEfrqvxw==
   dependencies:
     clean-css "^4.1.5"
     concat-stream "^1.6.0"
@@ -1698,7 +1485,6 @@ browserify-css@^0.14.0:
 browserify-des@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
-  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -1708,7 +1494,6 @@ browserify-des@^1.0.0:
 browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
@@ -1716,7 +1501,6 @@ browserify-rsa@^4.0.0:
 browserify-sign@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -1729,14 +1513,12 @@ browserify-sign@^4.0.0:
 browserify-zlib@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
     pako "~1.0.5"
 
 browserify@^16.1.0, browserify@^16.2.2:
   version "16.2.3"
   resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.2.3.tgz#7ee6e654ba4f92bce6ab3599c3485b1cc7a0ad0b"
-  integrity sha512-zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ==
   dependencies:
     JSONStream "^1.0.3"
     assert "^1.4.0"
@@ -1790,7 +1572,6 @@ browserify@^16.1.0, browserify@^16.2.2:
 browserslist@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.2.0.tgz#3e5e5edf7fa9758ded0885cf88c1e4be753a591c"
-  integrity sha512-Berls1CHL7qfQz8Lct6QxYA5d2Tvt4doDWHcjvAISybpd+EKZVppNtXgXhaN6SdrPKo7YLTSZuYBs5cYrSWN8w==
   dependencies:
     caniuse-lite "^1.0.30000889"
     electron-to-chromium "^1.3.73"
@@ -1799,49 +1580,40 @@ browserslist@^4.1.0:
 bs-recipes@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585"
-  integrity sha1-DS1NSKcYyMBEdp/cT4lZLci2lYU=
 
 bs-snippet-injector@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/bs-snippet-injector/-/bs-snippet-injector-2.0.1.tgz#61b5393f11f52559ed120693100343b6edb04dd5"
-  integrity sha1-YbU5PxH1JVntEgaTEANDtu2wTdU=
 
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
-  integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=
   dependencies:
     node-int64 "^0.4.0"
 
 btoa-lite@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
-  integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc=
 
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 buffer-indexof-polyfill@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.1.tgz#a9fb806ce8145d5428510ce72f278bb363a638bf"
-  integrity sha1-qfuAbOgUXVQoUQznLyeLs2OmOL8=
 
 buffer-shims@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
-  integrity sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=
 
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^5.0.2:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
-  integrity sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -1849,37 +1621,30 @@ buffer@^5.0.2:
 buffers@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
-  integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s=
 
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 bulma-tooltip@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/bulma-tooltip/-/bulma-tooltip-2.0.2.tgz#cf0bf5ad2dc75492cbcbd4816e1a005314dc90ac"
-  integrity sha512-xsqWeWV7tsUn3uH04SqJeP7/CyC1RaDVIyVzr4/sIO3friIIOi7L6jc5g7qUwDxuBQl72yH/yRPuefpXoQ4hWg==
 
 bulma@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.7.1.tgz#73c2e3b2930c90cc272029cbd19918b493fca486"
-  integrity sha512-wRSO2LXB+qI9Pyz2id+uZr4quz5aftSN7Ay1ysr1+krzVp3utD+Ci4CeKuZdrYGc800t65b7heXBL6qw2Wo/lQ==
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -1894,34 +1659,28 @@ cache-base@^1.0.1:
 cached-path-relative@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
-  integrity sha1-0JxLUoAKpMB44t2BqGmqyQ0uVOc=
 
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
   dependencies:
     callsites "^0.2.0"
 
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
 callsites@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
 
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
@@ -1929,51 +1688,42 @@ camelcase-keys@^2.0.0:
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
 camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 caniuse-lite@^1.0.30000889:
   version "1.0.30000890"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000890.tgz#86a18ffcc65d79ec6a437e985761b8bf1c4efeaf"
-  integrity sha512-4NI3s4Y6ROm+SgZN5sLUG4k7nVWQnedis3c/RWkynV5G6cHSY7+a8fwFyn2yoBDE3E6VswhTNNwR3PvzGqlTkg==
 
 capture-exit@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
-  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
   dependencies:
     rsvp "^3.3.3"
 
 caseless@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
-  integrity sha1-cVuW6phBWTzDMGeSP17GDr2k99c=
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 chainsaw@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98"
-  integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=
   dependencies:
     traverse ">=0.3.0 <0.4"
 
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -1984,7 +1734,6 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -2005,17 +1754,14 @@ character-reference-invalid@^1.0.0:
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
 charenc@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
 
 cheerio@^1.0.0-rc.2:
   version "1.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
-  integrity sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=
   dependencies:
     css-select "~1.2.0"
     dom-serializer "~0.1.0"
@@ -2027,7 +1773,6 @@ cheerio@^1.0.0-rc.2:
 chokidar@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
   dependencies:
     anymatch "^1.3.0"
     async-each "^1.0.0"
@@ -2043,7 +1788,6 @@ chokidar@^1.0.0:
 chokidar@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
-  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.0"
@@ -2063,17 +1807,14 @@ chokidar@^2.0.4:
 chownr@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
-  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
 
 ci-info@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
-  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -2081,12 +1822,10 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
 circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
 
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
@@ -2096,26 +1835,22 @@ class-utils@^0.3.5:
 classnames@^2.2.5, classnames@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
-  integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
 
 clean-css@^4.1.5:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
-  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
   dependencies:
     source-map "~0.6.0"
 
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
 clipboard@^2.0.0:
   version "2.0.1"
@@ -2128,7 +1863,6 @@ clipboard@^2.0.0:
 cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -2137,7 +1871,6 @@ cliui@^3.2.0:
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -2146,37 +1879,30 @@ cliui@^4.0.0:
 clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
 
 clone-stats@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
 
 clone-stats@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
 
 clone@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
 
 clone@^1.0.0, clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
 clone@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
 cloneable-readable@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.2.tgz#d591dee4a8f8bc15da43ce97dceeba13d43e2a65"
-  integrity sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==
   dependencies:
     inherits "^2.0.1"
     process-nextick-args "^2.0.0"
@@ -2185,17 +1911,14 @@ cloneable-readable@^1.0.0:
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -2203,34 +1926,28 @@ collection-visit@^1.0.0:
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
 colors@0.5.x:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
-  integrity sha1-fQAj6usVTo7p/Oddy5I9DtFmd3Q=
 
 colors@^1.1.2, colors@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
-  integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
 
 combine-source-map@^0.8.0, combine-source-map@~0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b"
-  integrity sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=
   dependencies:
     convert-source-map "~1.1.0"
     inline-source-map "~0.6.0"
@@ -2240,14 +1957,12 @@ combine-source-map@^0.8.0, combine-source-map@~0.8.0:
 combined-stream@1.0.6:
   version "1.0.6"
   resolved "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
   dependencies:
     delayed-stream "~1.0.0"
 
 combined-stream@^1.0.5, combined-stream@~1.0.5, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
-  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
   dependencies:
     delayed-stream "~1.0.0"
 
@@ -2260,37 +1975,30 @@ comma-separated-tokens@^1.0.0:
 commander@^2.11.0, commander@^2.17.1, commander@^2.2.0, commander@^2.9.0:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
-  integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
 
 commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
 
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
     inherits "^2.0.3"
@@ -2300,12 +2008,10 @@ concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0:
 connect-history-api-fallback@^1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
-  integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
 
 connect@3.6.6:
   version "3.6.6"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
-  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
   dependencies:
     debug "2.6.9"
     finalhandler "1.1.0"
@@ -2315,51 +2021,42 @@ connect@3.6.6:
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
   dependencies:
     date-now "^0.1.4"
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 constants-browserify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
 contains-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
 
 convert-source-map@1.X, convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
-  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
   dependencies:
     safe-buffer "~5.1.1"
 
 convert-source-map@~1.1.0:
   version "1.1.3"
   resolved "http://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
-  integrity sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=
 
 cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copyfiles@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.1.0.tgz#0e2a4188162d6b2f3c5adfe34e9c0bd564d23164"
-  integrity sha512-cAeDE0vL/koE9WSEGxqPpSyvU638Kgfu6wfrnj7kqp9FWa1CWsU54Coo6sdYZP4GstWa39tL/wIVJWfXcujgNA==
   dependencies:
     glob "^7.0.5"
     minimatch "^3.0.3"
@@ -2371,17 +2068,14 @@ copyfiles@^2.0.0:
 core-js@^2.4.0, core-js@^2.5.0:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
-  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 coveralls@^2.11.3:
   version "2.13.3"
   resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.13.3.tgz#9ad7c2ae527417f361e8b626483f48ee92dd2bc7"
-  integrity sha512-iiAmn+l1XqRwNLXhW8Rs5qHZRFMYp9ZIPjEOVRpC/c4so6Y/f4/lFi0FfR5B9cCqgyhkJ5cZmbvcVRfP8MHchw==
   dependencies:
     js-yaml "3.6.1"
     lcov-parse "0.0.10"
@@ -2392,7 +2086,6 @@ coveralls@^2.11.3:
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
-  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -2400,7 +2093,6 @@ create-ecdh@^4.0.0:
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
@@ -2411,7 +2103,6 @@ create-hash@^1.1.0, create-hash@^1.1.2:
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   version "1.1.7"
   resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -2423,7 +2114,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
@@ -2431,7 +2121,6 @@ cross-spawn@^3.0.0:
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
@@ -2440,7 +2129,6 @@ cross-spawn@^5.0.1:
 cross-spawn@^6.0.4, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -2451,19 +2139,16 @@ cross-spawn@^6.0.4, cross-spawn@^6.0.5:
 crypt@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
 
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
   dependencies:
     boom "2.x.x"
 
 crypto-browserify@^3.0.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -2480,7 +2165,6 @@ crypto-browserify@^3.0.0:
 css-select@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
-  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
   dependencies:
     boolbase "~1.0.0"
     css-what "2.1"
@@ -2490,19 +2174,16 @@ css-select@~1.2.0:
 css-vendor@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-0.3.8.tgz#6421cfd3034ce664fe7673972fd0119fc28941fa"
-  integrity sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo=
   dependencies:
     is-in-browser "^1.0.2"
 
 css-what@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
-  integrity sha1-lGfQMsOM+u+58teVASUwYvh/ob0=
 
 css@2.X, css@^2.2.1:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
-  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
   dependencies:
     inherits "^2.0.3"
     source-map "^0.6.1"
@@ -2512,45 +2193,38 @@ css@2.X, css@^2.2.1:
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz#8cd52e8a3acfd68d3aed38ee0a640177d2f9d797"
-  integrity sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==
 
 cssstyle@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz#18b038a9c44d65f7a8e428a653b9f6fe42faf5fb"
-  integrity sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog==
   dependencies:
     cssom "0.3.x"
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
   dependencies:
     es5-ext "^0.10.9"
 
 damerau-levenshtein@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
-  integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=
 
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
 data-urls@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.0.1.tgz#d416ac3896918f29ca84d81085bc3705834da579"
-  integrity sha512-0HdcMZzK6ubMUnsMmQmG0AcLQPvbvb47R0+7CCZQCYgcd8OUWG91CG7sM6GoXgjz+WLl4ArFzHtBMy/QqSF4eg==
   dependencies:
     abab "^2.0.0"
     whatwg-mimetype "^2.1.0"
@@ -2559,17 +2233,14 @@ data-urls@^1.0.0:
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
 dateformat@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
 
 debug-fabulous@1.X:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-1.1.0.tgz#af8a08632465224ef4174a9f06308c3c2a1ebc8e"
-  integrity sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==
   dependencies:
     debug "3.X"
     memoizee "0.4.X"
@@ -2578,102 +2249,86 @@ debug-fabulous@1.X:
 debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
 debug@3.1.0, debug@=3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
 debug@3.X, debug@^3.1.0:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407"
-  integrity sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==
   dependencies:
     ms "^2.1.1"
 
 debug@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.0.1.tgz#f9bb36d439b8d1f0dd52d8fb6b46e4ebb8c1cd5b"
-  integrity sha512-K23FHJ/Mt404FSlp6gSZCevIbTMLX0j3fmHhUEhQ3Wq0FMODW3+cUSoLdy1Gx4polAf4t/lphhmHH35BB8cLYw==
   dependencies:
     ms "^2.1.1"
 
 decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 decompress-response@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
   dependencies:
     mimic-response "^1.0.0"
 
 deep-diff@^0.3.5:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
-  integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=
 
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
 default-require-extensions@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
-  integrity sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=
   dependencies:
     strip-bom "^2.0.0"
 
 defaults@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
-  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
   dependencies:
     clone "^1.0.2"
 
 define-properties@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
   dependencies:
     object-keys "^1.0.12"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -2681,12 +2336,10 @@ define-property@^2.0.2:
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
 
 del@^2.0.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
   dependencies:
     globby "^5.0.0"
     is-path-cwd "^1.0.0"
@@ -2699,7 +2352,6 @@ del@^2.0.2:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegate@^3.1.2:
   version "3.2.0"
@@ -2708,22 +2360,18 @@ delegate@^3.1.2:
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 deprecated@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
-  integrity sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=
 
 deps-sort@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5"
-  integrity sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=
   dependencies:
     JSONStream "^1.0.3"
     shasum "^1.0.0"
@@ -2733,7 +2381,6 @@ deps-sort@^2.0.0:
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -2741,41 +2388,34 @@ des.js@^1.0.0:
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 detect-file@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
-  integrity sha1-STXe39lIhkjgBrASlWbpOGcR6mM=
   dependencies:
     fs-exists-sync "^0.1.0"
 
 detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
   dependencies:
     repeating "^2.0.0"
 
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
 detect-newline@2.X, detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
-  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
 
 detective@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/detective/-/detective-5.1.0.tgz#7a20d89236d7b331ccea65832e7123b5551bb7cb"
-  integrity sha512-TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ==
   dependencies:
     acorn-node "^1.3.0"
     defined "^1.0.0"
@@ -2784,12 +2424,10 @@ detective@^5.0.2:
 dev-ip@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
-  integrity sha1-p2o+0YVb56ASu4rBbLgPPADcKPA=
 
 diff2html@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/diff2html/-/diff2html-2.4.0.tgz#de632384eefa5a7f6b0e92eafb1fa25d22dc88ab"
-  integrity sha1-3mMjhO76Wn9rDpLq+x+iXSLciKs=
   dependencies:
     diff "^3.5.0"
     hogan.js "^3.0.2"
@@ -2799,12 +2437,10 @@ diff2html@^2.4.0:
 diff@^3.2.0, diff@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -2813,12 +2449,10 @@ diffie-hellman@^5.0.0:
 discontinuous-range@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
-  integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
 
 doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
@@ -2826,14 +2460,12 @@ doctrine@1.5.0:
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
   dependencies:
     esutils "^2.0.2"
 
 dom-serializer@0, dom-serializer@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
-  integrity sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=
   dependencies:
     domelementtype "~1.1.1"
     entities "~1.1.1"
@@ -2841,36 +2473,30 @@ dom-serializer@0, dom-serializer@~0.1.0:
 domain-browser@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-  integrity sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=
 
 domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-  integrity sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=
 
 domexception@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
-  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
   dependencies:
     webidl-conversions "^4.0.2"
 
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
-  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
   dependencies:
     domelementtype "1"
 
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -2878,7 +2504,6 @@ domutils@1.5.1:
 domutils@^1.5.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -2886,45 +2511,38 @@ domutils@^1.5.1:
 duplexer2@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
   dependencies:
     readable-stream "~1.1.9"
 
 duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2, duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
   dependencies:
     readable-stream "^2.0.2"
 
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
 duplexer@^0.1.1, duplexer@~0.1.1:
   version "0.1.1"
   resolved "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
 easy-extender@^2.3.4:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/easy-extender/-/easy-extender-2.3.4.tgz#298789b64f9aaba62169c77a2b3b64b4c9589b8f"
-  integrity sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==
   dependencies:
     lodash "^4.17.10"
 
 eazy-logger@^3:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-3.0.2.tgz#a325aa5e53d13a2225889b2ac4113b2b9636f4fc"
-  integrity sha1-oyWqXlPROiIliJsqxBE7K5Y29Pw=
   dependencies:
     tfunk "^3.0.1"
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
@@ -2932,17 +2550,14 @@ ecc-jsbn@~0.1.1:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.73:
   version "1.3.75"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.75.tgz#dd04551739e7371862b0ac7f4ddaa9f3f95b7e68"
-  integrity sha512-nLo03Qpw++8R6BxDZL/B1c8SQvUe/htdgc5LWYHe5YotV2jVvRUMP5AlOmxOsyeOzgMiXrNln2mC05Ixz6vuUQ==
 
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
-  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -2955,24 +2570,20 @@ elliptic@^6.0.0:
 emoji-regex@^6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2"
-  integrity sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ==
 
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 end-of-stream@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
-  integrity sha1-jhdyBsPICDfYVjLouTWd/osvbq8=
   dependencies:
     once "~1.3.0"
 
 engine.io-client@~3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
-  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -2989,7 +2600,6 @@ engine.io-client@~3.2.0:
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
-  integrity sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
@@ -3000,7 +2610,6 @@ engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
 engine.io@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz#54332506f42f2edc71690d2f2a42349359f3bf7d"
-  integrity sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==
   dependencies:
     accepts "~1.3.4"
     base64id "1.0.0"
@@ -3012,12 +2621,10 @@ engine.io@~3.2.0:
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
-  integrity sha1-blwtClYhtdra7O+AuQ7ftc13cvA=
 
 enzyme-adapter-react-16@^1.1.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.6.0.tgz#3fca28d3c32f3ff427495380fe2dd51494689073"
-  integrity sha512-ay9eGFpChyUDnjTFMMJHzrb681LF3hPWJLEA7RoLFG9jSWAdAm2V50pGmFV9dYGJgh5HfdiqM+MNvle41Yf/PA==
   dependencies:
     enzyme-adapter-utils "^1.8.0"
     function.prototype.name "^1.1.0"
@@ -3030,7 +2637,6 @@ enzyme-adapter-react-16@^1.1.1:
 enzyme-adapter-utils@^1.8.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.8.1.tgz#a927d840ce2c14b42892a533aec836809d4e022b"
-  integrity sha512-s3QB3xQAowaDS2sHhmEqrT13GJC4+n5bG015ZkLv60n9k5vhxxHTQRIneZmQ4hmdCZEBrvUJ89PG6fRI5OEeuQ==
   dependencies:
     function.prototype.name "^1.1.0"
     object.assign "^4.1.0"
@@ -3039,7 +2645,6 @@ enzyme-adapter-utils@^1.8.0:
 enzyme@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.7.0.tgz#9b499e8ca155df44fef64d9f1558961ba1385a46"
-  integrity sha512-QLWx+krGK6iDNyR1KlH5YPZqxZCQaVF6ike1eDJAOg0HvSkSCVImPsdWaNw6v+VrnK92Kg8jIOYhuOSS9sBpyg==
   dependencies:
     array.prototype.flat "^1.2.1"
     cheerio "^1.0.0-rc.2"
@@ -3064,14 +2669,12 @@ enzyme@^3.3.0:
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.10.0, es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.6.1, es-abstract@^1.7.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
-  integrity sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.1"
@@ -3082,7 +2685,6 @@ es-abstract@^1.10.0, es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.5.1,
 es-to-primitive@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
-  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
   dependencies:
     is-callable "^1.1.4"
     is-date-object "^1.0.1"
@@ -3091,7 +2693,6 @@ es-to-primitive@^1.1.1:
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
   version "0.10.46"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.46.tgz#efd99f67c5a7ec789baa3daa7f79870388f7f572"
-  integrity sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
@@ -3100,7 +2701,6 @@ es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.9, es5-ext@~
 es6-iterator@^2.0.1, es6-iterator@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
   dependencies:
     d "1"
     es5-ext "^0.10.35"
@@ -3109,19 +2709,16 @@ es6-iterator@^2.0.1, es6-iterator@~2.0.3:
 es6-promise@^4.0.3:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
-  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
 
 es6-symbol@^3.1.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -3129,7 +2726,6 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.1:
 es6-weak-map@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
-  integrity sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=
   dependencies:
     d "1"
     es5-ext "^0.10.14"
@@ -3139,17 +2735,14 @@ es6-weak-map@^2.0.2:
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@^1.9.1:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
-  integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -3161,12 +2754,10 @@ escodegen@^1.9.1:
 eslint-config-react-app@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-2.1.0.tgz#23c909f71cbaff76b945b831d2d814b8bde169eb"
-  integrity sha512-8QZrKWuHVC57Fmu+SsKAVxnI9LycZl7NFQ4H9L+oeISuCXhYdXqsOOIVSjQFW6JF5MXZLFE+21Syhd7mF1IRZQ==
 
 eslint-import-resolver-node@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
-  integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
   dependencies:
     debug "^2.6.9"
     resolve "^1.5.0"
@@ -3174,7 +2765,6 @@ eslint-import-resolver-node@^0.3.1:
 eslint-module-utils@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746"
-  integrity sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=
   dependencies:
     debug "^2.6.8"
     pkg-dir "^1.0.0"
@@ -3182,14 +2772,12 @@ eslint-module-utils@^2.2.0:
 eslint-plugin-flowtype@^2.50.0:
   version "2.50.3"
   resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.50.3.tgz#61379d6dce1d010370acd6681740fd913d68175f"
-  integrity sha512-X+AoKVOr7Re0ko/yEXyM5SSZ0tazc6ffdIOocp2fFUlWoDt7DV0Bz99mngOkAFLOAWjqRA5jPwqUCbrx13XoxQ==
   dependencies:
     lodash "^4.17.10"
 
 eslint-plugin-import@^2.14.0:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8"
-  integrity sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==
   dependencies:
     contains-path "^0.1.0"
     debug "^2.6.8"
@@ -3205,7 +2793,6 @@ eslint-plugin-import@^2.14.0:
 eslint-plugin-jsx-a11y@^6.1.1:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.1.2.tgz#69bca4890b36dcf0fe16dd2129d2d88b98f33f88"
-  integrity sha512-7gSSmwb3A+fQwtw0arguwMdOdzmKUgnUcbSNlo+GjKLAQFuC2EZxWqG9XHRI8VscBJD5a8raz3RuxQNFW+XJbw==
   dependencies:
     aria-query "^3.0.0"
     array-includes "^3.0.3"
@@ -3219,7 +2806,6 @@ eslint-plugin-jsx-a11y@^6.1.1:
 eslint-plugin-react@^7.11.1:
   version "7.11.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz#c01a7af6f17519457d6116aa94fc6d2ccad5443c"
-  integrity sha512-cVVyMadRyW7qsIUh3FHp3u6QHNhOgVrLQYdQEB1bPWBsgbNCHdFAeNMquBMCcZJu59eNthX053L70l7gRt4SCw==
   dependencies:
     array-includes "^3.0.3"
     doctrine "^2.1.0"
@@ -3230,7 +2816,6 @@ eslint-plugin-react@^7.11.1:
 eslint-scope@3.7.1:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
-  integrity sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -3238,7 +2823,6 @@ eslint-scope@3.7.1:
 eslint-scope@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
-  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -3246,17 +2830,14 @@ eslint-scope@^4.0.0:
 eslint-utils@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
-  integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
 
 eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
-  integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
 
 eslint@^5.4.0:
   version "5.6.1"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.6.1.tgz#348134e32ccc09abb2df1bf282b3f6eed8c7b480"
-  integrity sha512-hgrDtGWz368b7Wqf+v1Z69O3ZebNR0+GA7PtDdbmuz4rInFVUV9uw7whjZEiWyLzCjVb5Rs5WRN1TAS6eo7AYA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.5.3"
@@ -3300,7 +2881,6 @@ eslint@^5.4.0:
 espree@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/espree/-/espree-4.0.0.tgz#253998f20a0f82db5d866385799d912a83a36634"
-  integrity sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==
   dependencies:
     acorn "^5.6.0"
     acorn-jsx "^4.1.1"
@@ -3308,51 +2888,42 @@ espree@^4.0.0:
 esprima@^2.6.0:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
 
 esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
   dependencies:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
   dependencies:
     estraverse "^4.1.0"
 
 estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
 esutils@^2.0.0, esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
 etag@^1.8.1, etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
 event-emitter@^0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -3360,7 +2931,6 @@ event-emitter@^0.3.5:
 event-stream@~3.3.0:
   version "3.3.6"
   resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.6.tgz#cac1230890e07e73ec9cacd038f60a5b66173eef"
-  integrity sha512-dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g==
   dependencies:
     duplexer "^0.1.1"
     flatmap-stream "^0.1.0"
@@ -3374,17 +2944,14 @@ event-stream@~3.3.0:
 eventemitter3@1.x.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
-  integrity sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=
 
 events@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/events/-/events-2.1.0.tgz#2a9a1e18e6106e0e812aa9ebd4a819b3c29c0ba5"
-  integrity sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
@@ -3392,14 +2959,12 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
 exec-sh@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
-  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
   dependencies:
     merge "^1.2.0"
 
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -3412,19 +2977,16 @@ execa@^0.7.0:
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -3437,28 +2999,24 @@ expand-brackets@^2.1.4:
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
   dependencies:
     fill-range "^2.1.0"
 
 expand-tilde@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
-  integrity sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=
   dependencies:
     os-homedir "^1.0.1"
 
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
   dependencies:
     homedir-polyfill "^1.0.1"
 
 expect@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98"
-  integrity sha512-dgSoOHgmtn/aDGRVFWclQyPDKl2CQRq0hmIEoUAuQs/2rn2NcvCWcSCovm6BLeuB/7EZuLGu2QfnR+qRt5OM4w==
   dependencies:
     ansi-styles "^3.2.0"
     jest-diff "^23.6.0"
@@ -3470,14 +3028,12 @@ expect@^23.6.0:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -3485,12 +3041,10 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 extend@^3.0.0, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
-  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -3499,14 +3053,12 @@ external-editor@^3.0.0:
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
   dependencies:
     is-extglob "^1.0.0"
 
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -3520,17 +3072,14 @@ extglob@^2.0.4:
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 fancy-log@^1.1.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
-  integrity sha1-9BEl49hPLn2JpD0G2VjI94vha+E=
   dependencies:
     ansi-gray "^0.1.1"
     color-support "^1.1.3"
@@ -3539,27 +3088,22 @@ fancy-log@^1.1.0:
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fast-xml-parser@^3.12.0:
   version "3.12.5"
   resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.12.5.tgz#756e4da382f403f88990a62344add00948820fe0"
-  integrity sha512-g8TSGUF1a2vdFmQ29vKcYBNnwuJQQuyr6It3cjGsiD3dkUXqVWuXZQvjEkgrrCe5K8D30X125ACyxaj7XaaH8g==
   dependencies:
     nimnjs "^1.3.2"
 
@@ -3572,14 +3116,12 @@ fault@^1.0.2:
 fb-watchman@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
-  integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=
   dependencies:
     bser "^2.0.0"
 
 fetch-mock@^6.5.0:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/fetch-mock/-/fetch-mock-6.5.2.tgz#b3842b305c13ea0f81c85919cfaa7de387adfa3e"
-  integrity sha512-EIvbpCLBTYyDLu4HJiqD7wC8psDwTUaPaWXNKZbhNO/peUYKiNp5PkZGKRJtnTxaPQu71ivqafvjpM7aL+MofQ==
   dependencies:
     babel-polyfill "^6.26.0"
     glob-to-regexp "^0.4.0"
@@ -3588,14 +3130,12 @@ fetch-mock@^6.5.0:
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-entry-cache@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
   dependencies:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
@@ -3603,12 +3143,10 @@ file-entry-cache@^2.0.0:
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
 
 fileset@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
-  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
   dependencies:
     glob "^7.0.3"
     minimatch "^3.0.3"
@@ -3616,7 +3154,6 @@ fileset@^2.0.2:
 fill-range@^2.1.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -3627,7 +3164,6 @@ fill-range@^2.1.0:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -3637,7 +3173,6 @@ fill-range@^4.0.0:
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -3650,12 +3185,10 @@ finalhandler@1.1.0:
 find-index@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
-  integrity sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=
 
 find-node-modules@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/find-node-modules/-/find-node-modules-1.0.4.tgz#b6deb3cccb699c87037677bcede2c5f5862b2550"
-  integrity sha1-tt6zzMtpnIcDdne87eLF9YYrJVA=
   dependencies:
     findup-sync "0.4.2"
     merge "^1.2.0"
@@ -3663,7 +3196,6 @@ find-node-modules@^1.0.4:
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
@@ -3671,14 +3203,12 @@ find-up@^1.0.0:
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
 findup-sync@0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.2.tgz#a8117d0f73124f5a4546839579fe52d7129fb5e5"
-  integrity sha1-qBF9D3MST1pFRoOVef5S1xKfteU=
   dependencies:
     detect-file "^0.1.0"
     is-glob "^2.0.1"
@@ -3688,7 +3218,6 @@ findup-sync@0.4.2:
 findup-sync@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
-  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
   dependencies:
     detect-file "^1.0.0"
     is-glob "^3.1.0"
@@ -3698,7 +3227,6 @@ findup-sync@^2.0.0:
 fined@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.0.tgz#b37dc844b76a2f5e7081e884f7c0ae344f153476"
-  integrity sha1-s33IRLdqL15wgeiE98CuNE8VNHY=
   dependencies:
     expand-tilde "^2.0.2"
     is-plain-object "^2.0.3"
@@ -3709,17 +3237,14 @@ fined@^1.0.1:
 first-chunk-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
-  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
 
 flagged-respawn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"
-  integrity sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=
 
 flat-cache@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
-  integrity sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=
   dependencies:
     circular-json "^0.3.1"
     del "^2.0.2"
@@ -3729,17 +3254,14 @@ flat-cache@^1.2.1:
 flatmap-stream@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/flatmap-stream/-/flatmap-stream-0.1.1.tgz#d34f39ef3b9aa5a2fc225016bd3adf28ac5ae6ea"
-  integrity sha512-lAq4tLbm3sidmdCN8G3ExaxH7cUCtP5mgDvrYowsx84dcYkJJ4I28N7gkxA6+YlSXzaGLJYIDEi9WGfXzMiXdw==
 
 flow-bin@^0.79.1:
   version "0.79.1"
   resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.79.1.tgz#01c9f427baa6556753fa878c192d42e1ecb764b6"
-  integrity sha512-GGetgxz6q9BNqqCQ8wgAGRtyYWXltn++39C6W8HKbS1QC59USfwm3YP3X+eITp7wbkwa+LGlhGfggqeQxOY1vw==
 
 flow-typed@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/flow-typed/-/flow-typed-2.5.1.tgz#0ff565cc94d2af8c557744ba364b6f14726a6b9f"
-  integrity sha1-D/VlzJTSr4xVd0S6NktvFHJqa58=
   dependencies:
     "@octokit/rest" "^15.2.6"
     babel-polyfill "^6.26.0"
@@ -3760,43 +3282,36 @@ flow-typed@^2.5.1:
 follow-redirects@^1.2.5:
   version "1.5.8"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.8.tgz#1dbfe13e45ad969f813e86c00e5296f525c885a1"
-  integrity sha512-sy1mXPmv7kLAMKW/8XofG7o9T+6gAjzdZK4AJF6ryqQYUa/hnzgiypoeUecZ53x7XiqKNEpNqLtS97MshW2nxg==
   dependencies:
     debug "=3.1.0"
 
 font-awesome@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
   dependencies:
     for-in "^1.0.1"
 
 for-own@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
   dependencies:
     for-in "^1.0.1"
 
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  integrity sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.5"
@@ -3805,7 +3320,6 @@ form-data@~2.1.1:
 form-data@~2.3.1, form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "1.0.6"
@@ -3818,29 +3332,24 @@ format@^0.2.2:
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2, fresh@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
 from@^0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
-  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
 
 fs-exists-sync@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
-  integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=
 
 fs-extra@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
-  integrity sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^3.0.0"
@@ -3849,7 +3358,6 @@ fs-extra@3.0.1:
 fs-extra@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
-  integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -3858,19 +3366,16 @@ fs-extra@^5.0.0:
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.0.0, fsevents@^1.2.2, fsevents@^1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
@@ -3878,7 +3383,6 @@ fsevents@^1.0.0, fsevents@^1.2.2, fsevents@^1.2.3:
 fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -3888,12 +3392,10 @@ fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10:
 function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 function.prototype.name@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.0.tgz#8bd763cc0af860a859cc5d49384d74b932cd2327"
-  integrity sha512-Bs0VRrTz4ghD8pTmbJQD1mZ8A/mN0ur/jGz+A6FBxPDUPkm1tNfF6bhTYPA7i7aF4lZJVr+OXTNNrnnIl58Wfg==
   dependencies:
     define-properties "^1.1.2"
     function-bind "^1.1.1"
@@ -3902,12 +3404,10 @@ function.prototype.name@^1.1.0:
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -3921,72 +3421,60 @@ gauge@~2.7.3:
 gaze@^0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f"
-  integrity sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=
   dependencies:
     globule "~0.1.0"
 
 gaze@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
   dependencies:
     globule "^1.0.0"
 
 generate-function@^2.0.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
-  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
   dependencies:
     is-property "^1.0.2"
 
 generate-object-property@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
   dependencies:
     is-property "^1.0.0"
 
 get-assigned-identifiers@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz#6dbf411de648cbaf8d9169ebb0d2d576191e2ff1"
-  integrity sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
 gitdiff-parser@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/gitdiff-parser/-/gitdiff-parser-0.1.2.tgz#26a256e05e9c2d5016b512a96c1dacb40862b92a"
-  integrity sha512-glDM6E1AwLYYTOPyI0CqamNEUSuwwAkmwULWpE2sHMpMZNzGJwErt7+eV+yIZcsbDza0pVSlwlBHFWbTf2Wu7A==
 
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
@@ -3994,14 +3482,12 @@ glob-base@^0.3.0:
 glob-parent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
   dependencies:
     is-glob "^2.0.0"
 
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
@@ -4009,7 +3495,6 @@ glob-parent@^3.1.0:
 glob-stream@^3.1.5:
   version "3.1.18"
   resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
-  integrity sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=
   dependencies:
     glob "^4.3.1"
     glob2base "^0.0.12"
@@ -4021,26 +3506,22 @@ glob-stream@^3.1.5:
 glob-to-regexp@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.0.tgz#49bd677b1671022bd10921c3788f23cdebf9c7e6"
-  integrity sha512-fyPCII4vn9Gvjq2U/oDAfP433aiE64cyP/CJjRJcpVGjqqNdioUYn9+r0cSzT1XPwmGAHuTT7iv+rQT8u/YHKQ==
 
 glob-watcher@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
-  integrity sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=
   dependencies:
     gaze "^0.5.1"
 
 glob2base@^0.0.12:
   version "0.0.12"
   resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
-  integrity sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=
   dependencies:
     find-index "^0.1.1"
 
 glob@^4.3.1:
   version "4.5.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
-  integrity sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -4050,7 +3531,6 @@ glob@^4.3.1:
 glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4062,7 +3542,6 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, gl
 glob@~3.1.21:
   version "3.1.21"
   resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
-  integrity sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=
   dependencies:
     graceful-fs "~1.2.0"
     inherits "1"
@@ -4071,7 +3550,6 @@ glob@~3.1.21:
 global-modules@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
-  integrity sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=
   dependencies:
     global-prefix "^0.1.4"
     is-windows "^0.2.0"
@@ -4079,7 +3557,6 @@ global-modules@^0.2.3:
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
   dependencies:
     global-prefix "^1.0.1"
     is-windows "^1.0.1"
@@ -4088,7 +3565,6 @@ global-modules@^1.0.0:
 global-prefix@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
-  integrity sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=
   dependencies:
     homedir-polyfill "^1.0.0"
     ini "^1.3.4"
@@ -4098,7 +3574,6 @@ global-prefix@^0.1.4:
 global-prefix@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
   dependencies:
     expand-tilde "^2.0.2"
     homedir-polyfill "^1.0.1"
@@ -4109,17 +3584,14 @@ global-prefix@^1.0.1:
 globals@^11.1.0, globals@^11.7.0:
   version "11.8.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
-  integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==
 
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
 globby@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
   dependencies:
     array-union "^1.0.1"
     arrify "^1.0.0"
@@ -4131,7 +3603,6 @@ globby@^5.0.0:
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -4142,7 +3613,6 @@ globby@^6.1.0:
 globule@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
-  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
   dependencies:
     glob "~7.1.1"
     lodash "~4.17.10"
@@ -4151,7 +3621,6 @@ globule@^1.0.0:
 globule@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
-  integrity sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=
   dependencies:
     glob "~3.1.21"
     lodash "~1.0.1"
@@ -4160,7 +3629,6 @@ globule@~0.1.0:
 glogg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.1.tgz#dcf758e44789cc3f3d32c1f3562a3676e6a34810"
-  integrity sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==
   dependencies:
     sparkles "^1.0.0"
 
@@ -4173,7 +3641,6 @@ good-listener@^1.2.2:
 got@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a"
-  integrity sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==
   dependencies:
     decompress-response "^3.2.0"
     duplexer3 "^0.1.4"
@@ -4193,29 +3660,24 @@ got@^7.1.0:
 graceful-fs@4.X, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
 graceful-fs@^3.0.0:
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
-  integrity sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=
   dependencies:
     natives "^1.1.0"
 
 graceful-fs@~1.2.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
-  integrity sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=
 
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
-  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
 gulp-sourcemaps@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-2.6.4.tgz#cbb2008450b1bcce6cd23bf98337be751bf6e30a"
-  integrity sha1-y7IAhFCxvM5s0jv5gze+dRv24wo=
   dependencies:
     "@gulp-sourcemaps/identity-map" "1.X"
     "@gulp-sourcemaps/map-sources" "1.X"
@@ -4232,7 +3694,6 @@ gulp-sourcemaps@^2.6.4:
 gulp-uglify@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/gulp-uglify/-/gulp-uglify-3.0.1.tgz#8d3eee466521bea6b10fd75dff72adf8b7ea2d97"
-  integrity sha512-KVffbGY9d4Wv90bW/B1KZJyunLMyfHTBbilpDvmcrj5Go0/a1G3uVpt+1gRBWSw/11dqR3coJ1oWNTt1AiXuWQ==
   dependencies:
     gulplog "^1.0.0"
     has-gulplog "^0.1.0"
@@ -4246,7 +3707,6 @@ gulp-uglify@^3.0.1:
 gulp-util@^3.0.0:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
   dependencies:
     array-differ "^1.0.0"
     array-uniq "^1.0.2"
@@ -4270,7 +3730,6 @@ gulp-util@^3.0.0:
 gulp@^3.9.1:
   version "3.9.1"
   resolved "http://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
-  integrity sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=
   dependencies:
     archy "^1.0.0"
     chalk "^1.0.0"
@@ -4289,14 +3748,12 @@ gulp@^3.9.1:
 gulplog@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
   dependencies:
     glogg "^1.0.0"
 
 handlebars@^4.0.3:
   version "4.0.12"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
-  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
   dependencies:
     async "^2.5.0"
     optimist "^0.6.1"
@@ -4307,12 +3764,10 @@ handlebars@^4.0.3:
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  integrity sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=
   dependencies:
     chalk "^1.1.1"
     commander "^2.9.0"
@@ -4322,7 +3777,6 @@ har-validator@~2.0.6:
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
   dependencies:
     ajv "^5.1.0"
     har-schema "^2.0.0"
@@ -4330,7 +3784,6 @@ har-validator@~5.0.3:
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
   dependencies:
     ajv "^5.3.0"
     har-schema "^2.0.0"
@@ -4338,65 +3791,54 @@ har-validator@~5.1.0:
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-gulplog@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
   dependencies:
     sparkles "^1.0.0"
 
 has-symbol-support-x@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
-  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
 
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
 
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
-  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
   dependencies:
     has-symbol-support-x "^1.4.1"
 
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -4405,7 +3847,6 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -4414,12 +3855,10 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -4427,14 +3866,12 @@ has-values@^1.0.0:
 has@^1.0.0, has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -4442,7 +3879,6 @@ hash-base@^3.0.0:
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
-  integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
@@ -4463,7 +3899,6 @@ hastscript@^4.0.0:
 hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
   dependencies:
     boom "2.x.x"
     cryptiles "2.x.x"
@@ -4477,7 +3912,6 @@ highlight.js@~9.12.0:
 history@^4.7.2:
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"
-  integrity sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==
   dependencies:
     invariant "^2.2.1"
     loose-envify "^1.2.0"
@@ -4488,7 +3922,6 @@ history@^4.7.2:
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
@@ -4497,12 +3930,10 @@ hmac-drbg@^1.0.0:
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
 
 hogan.js@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/hogan.js/-/hogan.js-3.0.2.tgz#4cd9e1abd4294146e7679e41d7898732b02c7bfd"
-  integrity sha1-TNnhq9QpQUbnZ55B14mHMrAse/0=
   dependencies:
     mkdirp "0.3.0"
     nopt "1.0.10"
@@ -4510,12 +3941,10 @@ hogan.js@^3.0.2:
 hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
-  integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
 home-or-tmp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
@@ -4523,38 +3952,32 @@ home-or-tmp@^2.0.0:
 homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
-  integrity sha1-TCu8inWJmP7r9e1oWA921GdotLw=
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
-  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
 html-encoding-sniffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
-  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
   dependencies:
     whatwg-encoding "^1.0.1"
 
 html-parse-stringify2@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/html-parse-stringify2/-/html-parse-stringify2-2.0.1.tgz#dc5670b7292ca158b7bc916c9a6735ac8872834a"
-  integrity sha1-3FZwtyksoVi3vJFsmmc1rIhyg0o=
   dependencies:
     void-elements "^2.0.1"
 
 htmlescape@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
-  integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=
 
 htmlparser2@^3.9.1:
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
-  integrity sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=
   dependencies:
     domelementtype "^1.3.0"
     domhandler "^2.3.0"
@@ -4566,7 +3989,6 @@ htmlparser2@^3.9.1:
 http-errors@1.6.3, http-errors@~1.6.2:
   version "1.6.3"
   resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -4576,7 +3998,6 @@ http-errors@1.6.3, http-errors@~1.6.2:
 http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
   dependencies:
     agent-base "4"
     debug "3.1.0"
@@ -4584,7 +4005,6 @@ http-proxy-agent@^2.1.0:
 http-proxy@1.15.2:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.15.2.tgz#642fdcaffe52d3448d2bda3b0079e9409064da31"
-  integrity sha1-ZC/cr/5S00SNK9o7AHnpQJBk2jE=
   dependencies:
     eventemitter3 "1.x.x"
     requires-port "1.x.x"
@@ -4592,7 +4012,6 @@ http-proxy@1.15.2:
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
   dependencies:
     assert-plus "^0.2.0"
     jsprim "^1.2.2"
@@ -4601,7 +4020,6 @@ http-signature@~1.1.0:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -4610,12 +4028,10 @@ http-signature@~1.2.0:
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
@@ -4623,70 +4039,58 @@ https-proxy-agent@^2.2.0:
 hyphenate-style-name@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
-  integrity sha1-MRYKNpMK2vH8BMYHT360FGXU7Es=
 
 i18next-browser-languagedetector@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-2.2.3.tgz#4196a9964b6d51b76254706a267ba746c9ca19de"
-  integrity sha512-sJZ2n9Vgax0vGer23hJMwyO3FRO7P0dq2DXZPXWE329g3snfJUcw+S24Mp3lqJaxL/0McDu4BD75ds6pzIfhhw==
 
 i18next-fetch-backend@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/i18next-fetch-backend/-/i18next-fetch-backend-0.1.0.tgz#18b67920d0e605e616f93bbdf897e59adf9c9c05"
-  integrity sha512-qnas13LdqiX3ViKjP/isoYz/38g5KvlAxmTt0ZQ8Ok/l9cS9pqTqpAf+7xdnvCmiQYzaqAuucEzJAD/qoyVIIQ==
   dependencies:
     i18next-xhr-backend "^1.4.3"
 
 i18next-xhr-backend@^1.4.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/i18next-xhr-backend/-/i18next-xhr-backend-1.5.1.tgz#50282610780c6a696d880dfa7f4ac1d01e8c3ad5"
-  integrity sha512-9OLdC/9YxDvTFcgsH5t2BHCODHEotHCa6h7Ly0EUlUC7Y2GS09UeoHOGj3gWKQ3HCqXz8NlH4gOrK3NNc9vPuw==
 
 i18next@^11.4.0:
   version "11.9.0"
   resolved "https://registry.yarnpkg.com/i18next/-/i18next-11.9.0.tgz#c30c0a5e0a857124923a8dd1ce8f1df603e30c70"
-  integrity sha512-NDuIoELzyJ+29kc29j9aKgzjZht4kEKh3PPdz0qCEC9ZUpgRVaWUdkMRES/NVTcpe1ei4MMwY8DNWBWCIUlAng==
 
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
-  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
 
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
   dependencies:
     minimatch "^3.0.4"
 
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 immutable@^3:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
-  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
 
 import-local@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
-  integrity sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==
   dependencies:
     pkg-dir "^2.0.0"
     resolve-cwd "^2.0.0"
@@ -4694,29 +4098,24 @@ import-local@^1.0.0:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
-  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
 
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -4724,34 +4123,28 @@ inflight@^1.0.4:
 inherits@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
-  integrity sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=
 
 inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
 inline-source-map@~0.6.0:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5"
-  integrity sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=
   dependencies:
     source-map "~0.5.3"
 
 inquirer@^6.1.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
-  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
@@ -4770,7 +4163,6 @@ inquirer@^6.1.0:
 insert-module-globals@^7.0.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.2.0.tgz#ec87e5b42728479e327bd5c5c71611ddfb4752ba"
-  integrity sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw==
   dependencies:
     JSONStream "^1.0.3"
     acorn-node "^1.5.2"
@@ -4786,24 +4178,20 @@ insert-module-globals@^7.0.0:
 interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
 invariant@^2.0.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
   dependencies:
     is-relative "^1.0.0"
     is-windows "^1.0.1"
@@ -4811,14 +4199,12 @@ is-absolute@^1.0.0:
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
@@ -4836,62 +4222,52 @@ is-alphanumerical@^1.0.0:
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-boolean-object@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
-  integrity sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=
 
 is-buffer@^1.1.0, is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
   dependencies:
     builtin-modules "^1.0.0"
 
 is-callable@^1.1.3, is-callable@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
 is-ci@^1.0.10:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
-  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
   dependencies:
     ci-info "^1.5.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
 
 is-decimal@^1.0.0:
   version "1.0.2"
@@ -4900,7 +4276,6 @@ is-decimal@^1.0.0:
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -4909,7 +4284,6 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -4918,84 +4292,70 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
   dependencies:
     is-primitive "^2.0.0"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-function@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
-  integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=
 
 is-generator-fn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
-  integrity sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
   dependencies:
     is-extglob "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
   dependencies:
     is-extglob "^2.1.1"
 
@@ -5006,17 +4366,14 @@ is-hexadecimal@^1.0.0:
 is-in-browser@^1.0.2, is-in-browser@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
-  integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=
 
 is-my-ip-valid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
-  integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==
 
 is-my-json-valid@^2.12.4:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz#8fd6e40363cd06b963fa877d444bfb5eddc62175"
-  integrity sha512-mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q==
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
@@ -5027,219 +4384,180 @@ is-my-json-valid@^2.12.4:
 is-number-like@^1.0.3:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/is-number-like/-/is-number-like-1.0.8.tgz#2e129620b50891042e44e9bbbb30593e75cfbbe3"
-  integrity sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==
   dependencies:
     lodash.isfinite "^3.3.2"
 
 is-number-object@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
-  integrity sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=
 
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
-  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
 
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
   dependencies:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
   dependencies:
     path-is-inside "^1.0.1"
 
 is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
 
 is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
 
 is-promise@^2.1, is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
 is-property@^1.0.0, is-property@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
 
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
   dependencies:
     has "^1.0.1"
 
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
-  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
 
 is-relative@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
   dependencies:
     is-unc-path "^1.0.0"
 
 is-resolvable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
-  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-  integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
 
 is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-string@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
-  integrity sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=
 
 is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
 is-symbol@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
-  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
   dependencies:
     has-symbols "^1.0.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-unc-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
   dependencies:
     unc-path-regex "^0.1.2"
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
-  integrity sha1-3hqm1j6indJIc3tp8f+LgALSEIw=
 
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
 isarray@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.4.tgz#38e7bcbb0f3ba1b7933c86ba1894ddfc3781bbb7"
-  integrity sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-api@^1.3.1:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.7.tgz#a86c770d2b03e11e3f778cd7aedd82d2722092aa"
-  integrity sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==
   dependencies:
     async "^2.1.4"
     fileset "^2.0.2"
@@ -5256,19 +4574,16 @@ istanbul-api@^1.3.1:
 istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
-  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
 
 istanbul-lib-hook@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86"
-  integrity sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==
   dependencies:
     append-transform "^0.4.0"
 
 istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
-  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
@@ -5281,7 +4596,6 @@ istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2:
 istanbul-lib-report@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c"
-  integrity sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==
   dependencies:
     istanbul-lib-coverage "^1.2.1"
     mkdirp "^0.5.1"
@@ -5291,7 +4605,6 @@ istanbul-lib-report@^1.1.5:
 istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f"
-  integrity sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==
   dependencies:
     debug "^3.1.0"
     istanbul-lib-coverage "^1.2.1"
@@ -5302,14 +4615,12 @@ istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
 istanbul-reports@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a"
-  integrity sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==
   dependencies:
     handlebars "^4.0.3"
 
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
-  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
   dependencies:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
@@ -5317,14 +4628,12 @@ isurl@^1.0.0-alpha5:
 jest-changed-files@^23.4.2:
   version "23.4.2"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
-  integrity sha512-EyNhTAUWEfwnK0Is/09LxoqNDOn7mU7S3EHskG52djOFS/z+IT0jT3h3Ql61+dklcG7bJJitIWEMB4Sp1piHmA==
   dependencies:
     throat "^4.0.0"
 
 jest-cli@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.6.0.tgz#61ab917744338f443ef2baa282ddffdd658a5da4"
-  integrity sha512-hgeD1zRUp1E1zsiyOXjEn4LzRLWdJBV//ukAHGlx6s5mfCNJTbhbHjgxnDUXA8fsKWN/HqFFF6X5XcCwC/IvYQ==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
@@ -5366,7 +4675,6 @@ jest-cli@^23.6.0:
 jest-config@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d"
-  integrity sha512-i8V7z9BeDXab1+VNo78WM0AtWpBRXJLnkT+lyT+Slx/cbP5sZJ0+NDuLcmBE5hXAoK0aUp7vI+MOxR+R4d8SRQ==
   dependencies:
     babel-core "^6.0.0"
     babel-jest "^23.6.0"
@@ -5386,7 +4694,6 @@ jest-config@^23.6.0:
 jest-diff@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.6.0.tgz#1500f3f16e850bb3d71233408089be099f610c7d"
-  integrity sha512-Gz9l5Ov+X3aL5L37IT+8hoCUsof1CVYBb2QEkOupK64XyRR3h+uRpYIm97K7sY8diFxowR8pIGEdyfMKTixo3g==
   dependencies:
     chalk "^2.0.1"
     diff "^3.2.0"
@@ -5396,14 +4703,12 @@ jest-diff@^23.6.0:
 jest-docblock@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
-  integrity sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=
   dependencies:
     detect-newline "^2.1.0"
 
 jest-each@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.6.0.tgz#ba0c3a82a8054387016139c733a05242d3d71575"
-  integrity sha512-x7V6M/WGJo6/kLoissORuvLIeAoyo2YqLOoCDkohgJ4XOXSqOtyvr8FbInlAWS77ojBsZrafbozWoKVRdtxFCg==
   dependencies:
     chalk "^2.0.1"
     pretty-format "^23.6.0"
@@ -5411,7 +4716,6 @@ jest-each@^23.6.0:
 jest-environment-jsdom@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
-  integrity sha1-BWp5UrP+pROsYqFAosNox52eYCM=
   dependencies:
     jest-mock "^23.2.0"
     jest-util "^23.4.0"
@@ -5420,7 +4724,6 @@ jest-environment-jsdom@^23.4.0:
 jest-environment-node@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
-  integrity sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA=
   dependencies:
     jest-mock "^23.2.0"
     jest-util "^23.4.0"
@@ -5428,12 +4731,10 @@ jest-environment-node@^23.4.0:
 jest-get-type@^22.1.0:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
-  integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
 
 jest-haste-map@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.6.0.tgz#2e3eb997814ca696d62afdb3f2529f5bbc935e16"
-  integrity sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg==
   dependencies:
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.11"
@@ -5447,7 +4748,6 @@ jest-haste-map@^23.6.0:
 jest-jasmine2@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0"
-  integrity sha512-pe2Ytgs1nyCs8IvsEJRiRTPC0eVYd8L/dXJGU08GFuBwZ4sYH/lmFDdOL3ZmvJR8QKqV9MFuwlsAi/EWkFUbsQ==
   dependencies:
     babel-traverse "^6.0.0"
     chalk "^2.0.1"
@@ -5465,7 +4765,6 @@ jest-jasmine2@^23.6.0:
 jest-junit@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-5.2.0.tgz#980401db7aa69999cf117c6d740a8135c22ae379"
-  integrity sha512-Mdg0Qpdh1Xm/FA1B/mcLlmEmlr3XzH5pZg7MvcAwZhjHijPRd1z/UwYwkwNHmCV7o4ZOWCf77nLu7ZkhHHrtJg==
   dependencies:
     jest-config "^23.6.0"
     jest-validate "^23.0.1"
@@ -5476,14 +4775,12 @@ jest-junit@^5.1.0:
 jest-leak-detector@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz#e4230fd42cf381a1a1971237ad56897de7e171de"
-  integrity sha512-f/8zA04rsl1Nzj10HIyEsXvYlMpMPcy0QkQilVZDFOaPbv2ur71X5u2+C4ZQJGyV/xvVXtCCZ3wQ99IgQxftCg==
   dependencies:
     pretty-format "^23.6.0"
 
 jest-matcher-utils@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz#726bcea0c5294261a7417afb6da3186b4b8cac80"
-  integrity sha512-rosyCHQfBcol4NsckTn01cdelzWLU9Cq7aaigDf8VwwpIRvWE/9zLgX2bON+FkEW69/0UuYslUe22SOdEf2nog==
   dependencies:
     chalk "^2.0.1"
     jest-get-type "^22.1.0"
@@ -5492,7 +4789,6 @@ jest-matcher-utils@^23.6.0:
 jest-message-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
-  integrity sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8=
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.35"
     chalk "^2.0.1"
@@ -5503,17 +4799,14 @@ jest-message-util@^23.4.0:
 jest-mock@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
-  integrity sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=
 
 jest-regex-util@^23.3.0:
   version "23.3.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
-  integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=
 
 jest-resolve-dependencies@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d"
-  integrity sha512-EkQWkFWjGKwRtRyIwRwI6rtPAEyPWlUC2MpzHissYnzJeHcyCn1Hc8j7Nn1xUVrS5C6W5+ZL37XTem4D4pLZdA==
   dependencies:
     jest-regex-util "^23.3.0"
     jest-snapshot "^23.6.0"
@@ -5521,7 +4814,6 @@ jest-resolve-dependencies@^23.6.0:
 jest-resolve@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae"
-  integrity sha512-XyoRxNtO7YGpQDmtQCmZjum1MljDqUCob7XlZ6jy9gsMugHdN2hY4+Acz9Qvjz2mSsOnPSH7skBmDYCHXVZqkA==
   dependencies:
     browser-resolve "^1.11.3"
     chalk "^2.0.1"
@@ -5530,7 +4822,6 @@ jest-resolve@^23.6.0:
 jest-runner@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.6.0.tgz#3894bd219ffc3f3cb94dc48a4170a2e6f23a5a38"
-  integrity sha512-kw0+uj710dzSJKU6ygri851CObtCD9cN8aNkg8jWJf4ewFyEa6kwmiH/r/M1Ec5IL/6VFa0wnAk6w+gzUtjJzA==
   dependencies:
     exit "^0.1.2"
     graceful-fs "^4.1.11"
@@ -5549,7 +4840,6 @@ jest-runner@^23.6.0:
 jest-runtime@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.6.0.tgz#059e58c8ab445917cd0e0d84ac2ba68de8f23082"
-  integrity sha512-ycnLTNPT2Gv+TRhnAYAQ0B3SryEXhhRj1kA6hBPSeZaNQkJ7GbZsxOLUkwg6YmvWGdX3BB3PYKFLDQCAE1zNOw==
   dependencies:
     babel-core "^6.0.0"
     babel-plugin-istanbul "^4.1.6"
@@ -5576,12 +4866,10 @@ jest-runtime@^23.6.0:
 jest-serializer@^23.0.1:
   version "23.0.1"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
-  integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=
 
 jest-snapshot@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a"
-  integrity sha512-tM7/Bprftun6Cvj2Awh/ikS7zV3pVwjRYU2qNYS51VZHgaAMBs5l4o/69AiDHhQrj5+LA2Lq4VIvK7zYk/bswg==
   dependencies:
     babel-types "^6.0.0"
     chalk "^2.0.1"
@@ -5597,7 +4885,6 @@ jest-snapshot@^23.6.0:
 jest-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
-  integrity sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE=
   dependencies:
     callsites "^2.0.0"
     chalk "^2.0.1"
@@ -5611,7 +4898,6 @@ jest-util@^23.4.0:
 jest-validate@^23.0.1, jest-validate@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474"
-  integrity sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==
   dependencies:
     chalk "^2.0.1"
     jest-get-type "^22.1.0"
@@ -5621,7 +4907,6 @@ jest-validate@^23.0.1, jest-validate@^23.6.0:
 jest-watcher@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
-  integrity sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
@@ -5630,14 +4915,12 @@ jest-watcher@^23.4.0:
 jest-worker@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
-  integrity sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=
   dependencies:
     merge-stream "^1.0.1"
 
 jest@^23.5.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d"
-  integrity sha512-lWzcd+HSiqeuxyhG+EnZds6iO3Y3ZEnMrfZq/OTGvF/C+Z4fPMCdhWTGSAiO2Oym9rbEXfwddHhh6jqrTF3+Lw==
   dependencies:
     import-local "^1.0.0"
     jest-cli "^23.6.0"
@@ -5645,27 +4928,22 @@ jest@^23.5.0:
 js-base64@^2.1.8:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
-  integrity sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==
 
 js-levenshtein@^1.1.3:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.4.tgz#3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e"
-  integrity sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
 js-yaml@3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
-  integrity sha1-bl/mfYsgXOTSL60Ft3geja3MSzA=
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
@@ -5673,7 +4951,6 @@ js-yaml@3.6.1:
 js-yaml@^3.12.0, js-yaml@^3.7.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -5681,12 +4958,10 @@ js-yaml@^3.12.0, js-yaml@^3.7.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsdom@^11.5.1:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
-  integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==
   dependencies:
     abab "^2.0.0"
     acorn "^5.5.3"
@@ -5718,93 +4993,76 @@ jsdom@^11.5.1:
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
 
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
 json-stable-stringify@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45"
-  integrity sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=
   dependencies:
     jsonify "~0.0.0"
 
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
 jsonfile@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
-  integrity sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
 
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
@@ -5814,50 +5072,42 @@ jsprim@^1.2.2:
 jss-camel-case@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jss-camel-case/-/jss-camel-case-6.1.0.tgz#ccb1ff8d6c701c02a1fed6fb6fb6b7896e11ce44"
-  integrity sha512-HPF2Q7wmNW1t79mCqSeU2vdd/vFFGpkazwvfHMOhPlMgXrJDzdj9viA2SaHk9ZbD5pfL63a8ylp4++irYbbzMQ==
   dependencies:
     hyphenate-style-name "^1.0.2"
 
 jss-compose@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/jss-compose/-/jss-compose-5.0.0.tgz#ce01b2e4521d65c37ea42cf49116e5f7ab596484"
-  integrity sha512-YofRYuiA0+VbeOw0VjgkyO380sA4+TWDrW52nSluD9n+1FWOlDzNbgpZ/Sb3Y46+DcAbOS21W5jo6SAqUEiuwA==
   dependencies:
     warning "^3.0.0"
 
 jss-default-unit@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/jss-default-unit/-/jss-default-unit-8.0.2.tgz#cc1e889bae4c0b9419327b314ab1c8e2826890e6"
-  integrity sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg==
 
 jss-expand@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/jss-expand/-/jss-expand-5.3.0.tgz#02be076efe650125c842f5bb6fb68786fe441ed6"
-  integrity sha512-NiM4TbDVE0ykXSAw6dfFmB1LIqXP/jdd0ZMnlvlGgEMkMt+weJIl8Ynq1DsuBY9WwkNyzWktdqcEW2VN0RAtQg==
 
 jss-extend@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/jss-extend/-/jss-extend-6.2.0.tgz#4af09d0b72fb98ee229970f8ca852fec1ca2a8dc"
-  integrity sha512-YszrmcB6o9HOsKPszK7NeDBNNjVyiW864jfoiHoMlgMIg2qlxKw70axZHqgczXHDcoyi/0/ikP1XaHDPRvYtEA==
   dependencies:
     warning "^3.0.0"
 
 jss-global@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/jss-global/-/jss-global-3.0.0.tgz#e19e5c91ab2b96353c227e30aa2cbd938cdaafa2"
-  integrity sha512-wxYn7vL+TImyQYGAfdplg7yaxnPQ9RaXY/cIA8hawaVnmmWxDHzBK32u1y+RAvWboa3lW83ya3nVZ/C+jyjZ5Q==
 
 jss-nested@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/jss-nested/-/jss-nested-6.0.1.tgz#ef992b79d6e8f63d939c4397b9d99b5cbbe824ca"
-  integrity sha512-rn964TralHOZxoyEgeq3hXY8hyuCElnvQoVrQwKHVmu55VRDd6IqExAx9be5HgK0yN/+hQdgAXQl/GUrBbbSTA==
   dependencies:
     warning "^3.0.0"
 
 jss-preset-default@^4.3.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/jss-preset-default/-/jss-preset-default-4.5.0.tgz#d3a457012ccd7a551312014e394c23c4b301cadd"
-  integrity sha512-qZbpRVtHT7hBPpZEBPFfafZKWmq3tA/An5RNqywDsZQGrlinIF/mGD9lmj6jGqu8GrED2SMHZ3pPKLmjCZoiaQ==
   dependencies:
     jss-camel-case "^6.1.0"
     jss-compose "^5.0.0"
@@ -5873,26 +5123,22 @@ jss-preset-default@^4.3.0:
 jss-props-sort@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/jss-props-sort/-/jss-props-sort-6.0.0.tgz#9105101a3b5071fab61e2d85ea74cc22e9b16323"
-  integrity sha512-E89UDcrphmI0LzmvYk25Hp4aE5ZBsXqMWlkFXS0EtPkunJkRr+WXdCNYbXbksIPnKlBenGB9OxzQY+mVc70S+g==
 
 jss-template@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/jss-template/-/jss-template-1.0.1.tgz#09aed9d86cc547b07f53ef355d7e1777f7da430a"
-  integrity sha512-m5BqEWha17fmIVXm1z8xbJhY6GFJxNB9H68GVnCWPyGYfxiAgY9WTQyvDAVj+pYRgrXSOfN5V1T4+SzN1sJTeg==
   dependencies:
     warning "^3.0.0"
 
 jss-vendor-prefixer@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz#0166729650015ef19d9f02437c73667231605c71"
-  integrity sha512-Agd+FKmvsI0HLcYXkvy8GYOw3AAASBUpsmIRvVQheps+JWaN892uFOInTr0DRydwaD91vSSUCU4NssschvF7MA==
   dependencies:
     css-vendor "^0.3.8"
 
 jss@^9.7.0:
   version "9.8.7"
   resolved "https://registry.yarnpkg.com/jss/-/jss-9.8.7.tgz#ed9763fc0f2f0260fc8260dac657af61e622ce05"
-  integrity sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==
   dependencies:
     is-in-browser "^1.1.3"
     symbol-observable "^1.1.0"
@@ -5901,43 +5147,36 @@ jss@^9.7.0:
 jsx-ast-utils@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
-  integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=
   dependencies:
     array-includes "^3.0.3"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 kleur@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
-  integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==
 
 labeled-stream-splicer@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz#9cffa32fd99e1612fd1d86a8db962416d5292926"
-  integrity sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==
   dependencies:
     inherits "^2.0.1"
     isarray "^2.0.4"
@@ -5946,29 +5185,24 @@ labeled-stream-splicer@^2.0.0:
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
 lcov-parse@0.0.10:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
-  integrity sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=
 
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
-  integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
 
 leven@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
-  integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA=
 
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
@@ -5976,7 +5210,6 @@ levn@^0.3.0, levn@~0.3.0:
 liftoff@^2.1.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
-  integrity sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=
   dependencies:
     extend "^3.0.0"
     findup-sync "^2.0.0"
@@ -5990,17 +5223,14 @@ liftoff@^2.1.0:
 limiter@^1.0.5:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.3.tgz#32e2eb55b2324076943e5d04c1185ffb387968ef"
-  integrity sha512-zrycnIMsLw/3ZxTbW7HCez56rcFGecWTx5OZNplzcXUUmJLmoYArC6qdJzmAN5BWiNXGcpjhF9RQ1HSv5zebEw==
 
 listenercount@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"
-  integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=
 
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -6011,7 +5241,6 @@ load-json-file@^1.0.0:
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -6021,7 +5250,6 @@ load-json-file@^2.0.0:
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
@@ -6031,7 +5259,6 @@ load-json-file@^4.0.0:
 localtunnel@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-1.9.1.tgz#1d1737eab658add5a40266d8e43f389b646ee3b1"
-  integrity sha512-HWrhOslklDvxgOGFLxi6fQVnvpl6XdX4sPscfqMZkzi3gtt9V7LKBWYvNUcpHSVvjwCQ6xzXacVvICNbNcyPnQ==
   dependencies:
     axios "0.17.1"
     debug "2.6.9"
@@ -6041,7 +5268,6 @@ localtunnel@1.9.1:
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -6049,119 +5275,96 @@ locate-path@^2.0.0:
 lodash-es@^4.17.5:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0"
-  integrity sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q==
 
 lodash._basecopy@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
 
 lodash._basetostring@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
 
 lodash._basevalues@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
 
 lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
 
 lodash._isiterateecall@^3.0.0:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
 
 lodash._reescape@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
 
 lodash._reevaluate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
 
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
 lodash._root@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
 
 lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
 lodash.clonedeep@^4.3.2:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
 lodash.escape@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
   dependencies:
     lodash._root "^3.0.0"
 
 lodash.escape@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
-  integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=
 
 lodash.findlastindex@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.findlastindex/-/lodash.findlastindex-4.6.0.tgz#b8375ac0f02e9b926375cdf8dc3ea814abf9c6ac"
-  integrity sha1-uDdawPAum5Jjdc343D6oFKv5xqw=
 
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
-  integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
 
 lodash.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
 
 lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
 
 lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
 lodash.isfinite@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3"
-  integrity sha1-+4m2WpqAKBgz8LdHizpRBPiY67M=
 
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
   dependencies:
     lodash._getnative "^3.0.0"
     lodash.isarguments "^3.0.0"
@@ -6170,32 +5373,26 @@ lodash.keys@^3.0.0:
 lodash.mapvalues@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
-  integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=
 
 lodash.memoize@~3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
-  integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
 
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
-  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
 
 lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
 
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
 lodash.template@^3.0.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
   dependencies:
     lodash._basecopy "^3.0.0"
     lodash._basetostring "^3.0.0"
@@ -6210,7 +5407,6 @@ lodash.template@^3.0.0:
 lodash.templatesettings@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
   dependencies:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
@@ -6218,29 +5414,24 @@ lodash.templatesettings@^3.0.0:
 lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 lodash@~1.0.1:
   version "1.0.2"
   resolved "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
-  integrity sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=
 
 log-driver@1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"
-  integrity sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
@@ -6248,7 +5439,6 @@ loud-rejection@^1.0.0:
 lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
 lowlight@~1.9.1:
   version "1.9.2"
@@ -6260,12 +5450,10 @@ lowlight@~1.9.1:
 lru-cache@2:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
 
 lru-cache@^4.0.1:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
-  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -6273,72 +5461,60 @@ lru-cache@^4.0.1:
 lru-queue@0.1:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
-  integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=
   dependencies:
     es5-ext "~0.10.2"
 
 macos-release@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-1.1.0.tgz#831945e29365b470aa8724b0ab36c8f8959d10fb"
-  integrity sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==
 
 make-error-cause@^1.1.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/make-error-cause/-/make-error-cause-1.2.2.tgz#df0388fcd0b37816dff0a5fb8108939777dcbc9d"
-  integrity sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=
   dependencies:
     make-error "^1.2.0"
 
 make-error@^1.2.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
-  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
 make-iterator@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
-  integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
   dependencies:
     kind-of "^6.0.2"
 
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
-  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
   dependencies:
     tmpl "1.0.x"
 
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8"
-  integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
-  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
 
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
-  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -6347,7 +5523,6 @@ md5.js@^1.3.4:
 md5@^2.1.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
   dependencies:
     charenc "~0.0.1"
     crypt "~0.0.1"
@@ -6356,14 +5531,12 @@ md5@^2.1.0:
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
   dependencies:
     mimic-fn "^1.0.0"
 
 memoizee@0.4.X:
   version "0.4.14"
   resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.14.tgz#07a00f204699f9a95c2d9e77218271c7cd610d57"
-  integrity sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==
   dependencies:
     d "1"
     es5-ext "^0.10.45"
@@ -6377,12 +5550,10 @@ memoizee@0.4.X:
 memorystream@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
-  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
 
 meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -6398,19 +5569,16 @@ meow@^3.7.0:
 merge-stream@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
-  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
   dependencies:
     readable-stream "^2.0.1"
 
 merge@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
-  integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
 
 micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -6429,7 +5597,6 @@ micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -6448,7 +5615,6 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
@@ -6456,63 +5622,52 @@ miller-rabin@^4.0.0:
 mime-db@~1.36.0:
   version "1.36.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
-  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19, mime-types@~2.1.7:
   version "2.1.20"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
-  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
   dependencies:
     mime-db "~1.36.0"
 
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
 mime@^1.3.6:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
-  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
 minimatch@^2.0.1:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
-  integrity sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=
   dependencies:
     brace-expansion "^1.0.0"
 
 minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimatch@~0.2.11:
   version "0.2.14"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
-  integrity sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=
   dependencies:
     lru-cache "2"
     sigmund "~1.0.0"
@@ -6520,22 +5675,18 @@ minimatch@~0.2.11:
 minimist@0.0.8:
   version "0.0.8"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
 minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
 minipass@^2.2.1, minipass@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
-  integrity sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -6543,19 +5694,16 @@ minipass@^2.2.1, minipass@^2.3.3:
 minizlib@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
   dependencies:
     minipass "^2.2.1"
 
 mitt@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.1.3.tgz#528c506238a05dce11cd914a741ea2cc332da9b8"
-  integrity sha512-mUDCnVNsAi+eD6qA0HkRkwYczbLHJ49z17BGe2PYRhZL4wpZUFZGJHU7/5tmvohoma+Hdn0Vh/oJTiPEmgSruA==
 
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -6563,19 +5711,16 @@ mixin-deep@^1.2.0:
 mkdirp@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
-  integrity sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=
 
 "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
 module-deps@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.1.0.tgz#d1e1efc481c6886269f7112c52c3236188e16479"
-  integrity sha512-NPs5N511VD1rrVJihSso/LiBShRbJALYBKzDW91uZYy7BpjnO4bGnZL3HjZ9yKcFdZUWwaYjDz9zxbuP7vKMuQ==
   dependencies:
     JSONStream "^1.0.3"
     browser-resolve "^1.7.0"
@@ -6596,49 +5741,40 @@ module-deps@^6.0.0:
 moment@^2.22.2:
   version "2.22.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
-  integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
 
 moo@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz#3f847a26f31cf625a956a87f2b10fbc013bfd10e"
-  integrity sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw==
 
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
 multipipe@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
   dependencies:
     duplexer2 "0.0.2"
 
 mustache@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5"
-  integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ==
 
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
 nan@^2.10.0, nan@^2.9.2:
   version "2.11.1"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
-  integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -6655,17 +5791,14 @@ nanomatch@^1.2.9:
 natives@^1.1.0:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.5.tgz#3bdbdb4104023e5dd239b56fc7ef3d9a17acc6aa"
-  integrity sha512-1pJ+02gl2KJgCPFtpZGtuD4lGSJnIZvvFHCQTOeDRMSXjfu2GmYWuhI8NFMA4W2I5NNFRbfy/YCiVt4CgNpP8A==
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
 nearley@^2.7.10:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.15.1.tgz#965e4e6ec9ed6b80fc81453e161efbcebb36d247"
-  integrity sha512-8IUY/rUrKz2mIynUGh8k+tul1awMKEjeHHC5G3FHvvyAW6oq4mQfNp2c0BMea+sYZJvYcrrM6GmZVIle/GRXGw==
   dependencies:
     moo "^0.4.3"
     nomnom "~1.6.2"
@@ -6676,7 +5809,6 @@ nearley@^2.7.10:
 needle@^2.2.1:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
-  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
   dependencies:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
@@ -6685,32 +5817,26 @@ needle@^2.2.1:
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
 next-tick@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
-  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 nimn-date-parser@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/nimn-date-parser/-/nimn-date-parser-1.0.0.tgz#4ce55d1fd5ea206bbe82b76276f7b7c582139351"
-  integrity sha512-1Nf+x3EeMvHUiHsVuEhiZnwA8RMeOBVTQWfB1S2n9+i6PYCofHd2HRMD+WOHIHYshy4T4Gk8wQoCol7Hq3av8Q==
 
 nimn_schema_builder@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/nimn_schema_builder/-/nimn_schema_builder-1.1.0.tgz#b370ccf5b647d66e50b2dcfb20d0aa12468cd247"
-  integrity sha512-DK5/B8CM4qwzG2URy130avcwPev4uO0ev836FbQyKo1ms6I9z/i6EJyiZ+d9xtgloxUri0W+5gfR8YbPq7SheA==
 
 nimnjs@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/nimnjs/-/nimnjs-1.3.2.tgz#a6a877968d87fad836375a4f616525e55079a5ba"
-  integrity sha512-TIOtI4iqkQrUM1tiM76AtTQem0c7e56SkDZ7sj1d1MfUsqRcq2ZWQvej/O+HBTZV7u/VKnwlKTDugK/75IRPPw==
   dependencies:
     nimn-date-parser "^1.0.0"
     nimn_schema_builder "^1.0.0"
@@ -6718,12 +5844,10 @@ nimnjs@^1.3.2:
 node-fetch@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
-  integrity sha512-OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA==
 
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
-  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
   dependencies:
     fstream "^1.0.0"
     glob "^7.0.3"
@@ -6741,17 +5865,14 @@ node-gyp@^3.8.0:
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
-  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
 node-mkdirs@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/node-mkdirs/-/node-mkdirs-0.0.1.tgz#b20f50ba796a4f543c04a69942d06d06f8aaf552"
-  integrity sha1-sg9QunlqT1Q8BKaZQtBtBviq9VI=
 
 node-notifier@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea"
-  integrity sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==
   dependencies:
     growly "^1.3.0"
     semver "^5.4.1"
@@ -6761,7 +5882,6 @@ node-notifier@^5.2.1:
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -6777,14 +5897,12 @@ node-pre-gyp@^0.10.0:
 node-releases@^1.0.0-alpha.12:
   version "1.0.0-alpha.12"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.12.tgz#32e461b879ea76ac674e511d9832cf29da345268"
-  integrity sha512-VPB4rTPqpVyWKBHbSa4YPFme3+8WHsOSpvbp0Mfj0bWsC8TEjt4HQrLl1hsBDELlp1nB4lflSgSuGTYiuyaP7Q==
   dependencies:
     semver "^5.3.0"
 
 node-sass-chokidar@^1.3.0:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/node-sass-chokidar/-/node-sass-chokidar-1.3.3.tgz#0bc83b6f4a8264ae27cbc80b18c49ed445d07d68"
-  integrity sha512-Y8G/5orw1IJzkhzuKQG9K0i6/InbV5AF/6Jvk23rPFTWcJobG7Bp0bobQC05uRFv1yGdBexakKt+GHfDtuVEvw==
   dependencies:
     async-foreach "^0.1.3"
     chokidar "^2.0.4"
@@ -6798,7 +5916,6 @@ node-sass-chokidar@^1.3.0:
 node-sass@^4.9.2, node-sass@^4.9.3:
   version "4.9.3"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
-  integrity sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -6823,7 +5940,6 @@ node-sass@^4.9.2, node-sass@^4.9.3:
 nomnom@~1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971"
-  integrity sha1-hKZqJgF0QI/Ft3oY+IjszET7aXE=
   dependencies:
     colors "0.5.x"
     underscore "~1.4.4"
@@ -6831,7 +5947,6 @@ nomnom@~1.6.2:
 noms@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859"
-  integrity sha1-2o69nzr51nYJGbJ9nNyAkqczKFk=
   dependencies:
     inherits "^2.0.1"
     readable-stream "~1.0.31"
@@ -6839,21 +5954,18 @@ noms@0.0.0:
 nopt@1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
-  integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=
   dependencies:
     abbrev "1"
 
 "nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
@@ -6861,7 +5973,6 @@ nopt@^4.0.1:
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -6871,19 +5982,16 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
-  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
 npm-packlist@^1.1.6:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
-  integrity sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -6891,7 +5999,6 @@ npm-packlist@^1.1.6:
 npm-run-all@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.3.tgz#49f15b55a66bb4101664ce270cb18e7103f8f185"
-  integrity sha512-aOG0N3Eo/WW+q6sUIdzcV2COS8VnTZCmdji0VQIAZF3b+a3YWb0AD0vFIyjKec18A7beLGbaQ5jFTNI2bPt9Cg==
   dependencies:
     ansi-styles "^3.2.0"
     chalk "^2.1.0"
@@ -6906,14 +6013,12 @@ npm-run-all@^4.1.3:
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
 "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -6923,49 +6028,40 @@ npm-run-path@^2.0.0:
 nth-check@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
-  integrity sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=
   dependencies:
     boolbase "~1.0.0"
 
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 nwsapi@^2.0.7:
   version "2.0.9"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016"
-  integrity sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ==
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@4.X, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-assign@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
 
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
-  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -6974,34 +6070,28 @@ object-copy@^0.1.0:
 object-inspect@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
-  integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
 
 object-is@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
-  integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=
 
 object-keys@^1.0.11, object-keys@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
-  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
 
 object-path@^0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.9.2.tgz#0fd9a74fc5fad1ae3968b586bda5c632bd6c05a5"
-  integrity sha1-D9mnT8X60a45aLWGvaXGMr1sBaU=
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
 object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
   dependencies:
     define-properties "^1.1.2"
     function-bind "^1.1.1"
@@ -7011,7 +6101,6 @@ object.assign@^4.1.0:
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
-  integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
   dependencies:
     array-each "^1.0.1"
     array-slice "^1.0.0"
@@ -7021,7 +6110,6 @@ object.defaults@^1.1.0:
 object.entries@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
-  integrity sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.6.1"
@@ -7031,7 +6119,6 @@ object.entries@^1.0.4:
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
@@ -7039,7 +6126,6 @@ object.getownpropertydescriptors@^2.0.3:
 object.map@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
-  integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
   dependencies:
     for-own "^1.0.0"
     make-iterator "^1.0.0"
@@ -7047,7 +6133,6 @@ object.map@^1.0.0:
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
@@ -7055,14 +6140,12 @@ object.omit@^2.0.0:
 object.pick@^1.2.0, object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
 object.values@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a"
-  integrity sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.6.1"
@@ -7072,47 +6155,40 @@ object.values@^1.0.4:
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
 once@^1.3.0, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 once@~1.3.0:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
-  integrity sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=
   dependencies:
     wrappy "1"
 
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
     mimic-fn "^1.0.0"
 
 openurl@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.1.tgz#3875b4b0ef7a52c156f0db41d4609dbb0f94b387"
-  integrity sha1-OHW0sO96UsFW8NtB1GCduw+Us4c=
 
 opn@5.3.0:
   version "5.3.0"
   resolved "http://registry.npmjs.org/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
-  integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
   dependencies:
     is-wsl "^1.1.0"
 
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -7120,7 +6196,6 @@ optimist@^0.6.1:
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -7132,7 +6207,6 @@ optionator@^0.8.1, optionator@^0.8.2:
 orchestrator@^0.3.0:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
-  integrity sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=
   dependencies:
     end-of-stream "~0.1.5"
     sequencify "~0.0.7"
@@ -7141,29 +6215,24 @@ orchestrator@^0.3.0:
 ordered-read-streams@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
-  integrity sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=
 
 os-browserify@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
   resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
 
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
   dependencies:
     execa "^0.7.0"
     lcid "^1.0.0"
@@ -7172,7 +6241,6 @@ os-locale@^2.0.0:
 os-name@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/os-name/-/os-name-2.0.1.tgz#b9a386361c17ae3a21736ef0599405c9a8c5dc5e"
-  integrity sha1-uaOGNhwXrjohc27wWZQFyajF3F4=
   dependencies:
     macos-release "^1.0.0"
     win-release "^1.0.0"
@@ -7180,12 +6248,10 @@ os-name@^2.0.1:
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@0, osenv@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -7193,62 +6259,52 @@ osenv@0, osenv@^0.1.4:
 outpipe@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/outpipe/-/outpipe-1.1.1.tgz#50cf8616365e87e031e29a5ec9339a3da4725fa2"
-  integrity sha1-UM+GFjZeh+Ax4ppeyTOaPaRyX6I=
   dependencies:
     shell-quote "^1.4.2"
 
 p-cancelable@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
-  integrity sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
 p-timeout@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386"
-  integrity sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=
   dependencies:
     p-finally "^1.0.0"
 
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
 
 parents@^1.0.0, parents@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751"
-  integrity sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=
   dependencies:
     path-platform "~0.11.15"
 
 parse-asn1@^5.0.0:
   version "5.1.1"
   resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
-  integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -7270,7 +6326,6 @@ parse-entities@^1.1.2:
 parse-filepath@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
   dependencies:
     is-absolute "^1.0.0"
     map-cache "^0.2.0"
@@ -7279,7 +6334,6 @@ parse-filepath@^1.0.1:
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -7289,14 +6343,12 @@ parse-glob@^3.0.4:
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -7304,119 +6356,98 @@ parse-json@^4.0.0:
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
-  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
 parse5@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
-  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
   dependencies:
     "@types/node" "*"
 
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
-  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
   dependencies:
     better-assert "~1.0.0"
 
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
-  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
   dependencies:
     better-assert "~1.0.0"
 
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
-  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-browserify@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
-  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-platform@~0.11.15:
   version "0.11.15"
   resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2"
-  integrity sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=
 
 path-root-regex@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
 
 path-root@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
   dependencies:
     path-root-regex "^0.1.0"
 
 path-to-regexp@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
-  integrity sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=
   dependencies:
     isarray "0.0.1"
 
 path-to-regexp@^2.2.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.4.0.tgz#35ce7f333d5616f1c1e1bfe266c3aba2e5b2e704"
-  integrity sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==
 
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -7425,28 +6456,24 @@ path-type@^1.0.0:
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
   dependencies:
     pify "^2.0.0"
 
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
 pause-stream@^0.0.11:
   version "0.0.11"
   resolved "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
   dependencies:
     through "~2.3"
 
 pbkdf2@^3.0.3:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
-  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -7457,58 +6484,48 @@ pbkdf2@^3.0.3:
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
-  integrity sha1-ektQio1bstYp1EcFb/TpyTFM89Q=
   dependencies:
     find-up "^1.0.0"
 
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
   dependencies:
     find-up "^2.1.0"
 
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
 
 pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
-  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
 
 pom-parser@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/pom-parser/-/pom-parser-1.1.1.tgz#6fab4d2498e87c862072ab205aa88b1209e5f966"
-  integrity sha1-b6tNJJjofIYgcqsgWqiLEgnl+WY=
   dependencies:
     bluebird "^3.3.3"
     coveralls "^2.11.3"
@@ -7518,7 +6535,6 @@ pom-parser@^1.1.1:
 portscanner@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96"
-  integrity sha1-6rtAnk3iSVD1oqUW01rnaTQ/u5Y=
   dependencies:
     async "1.5.2"
     is-number-like "^1.0.3"
@@ -7526,12 +6542,10 @@ portscanner@2.1.1:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-easy-import@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-easy-import/-/postcss-easy-import-3.0.0.tgz#8eaaf5ae59566083d0cae98735dfd803e3ab194d"
-  integrity sha512-cfNsear/v8xlkl9v5Wm8y4Do/puiDQTFF+WX2Fo++h7oKt1fKWVVW/5Ca8hslYDQWnjndrg813cA23Pt1jsYdg==
   dependencies:
     globby "^6.1.0"
     is-glob "^4.0.0"
@@ -7545,7 +6559,6 @@ postcss-easy-import@^3.0.0:
 postcss-import@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-10.0.0.tgz#4c85c97b099136cc5ea0240dc1dfdbfde4e2ebbe"
-  integrity sha1-TIXJewmRNsxeoCQNwd/b/eTi674=
   dependencies:
     object-assign "^4.0.1"
     postcss "^6.0.1"
@@ -7556,12 +6569,10 @@ postcss-import@^10.0.0:
 postcss-value-parser@^3.2.3:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
-  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
 postcss@^6.0.1, postcss@^6.0.11:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"
@@ -7570,27 +6581,22 @@ postcss@^6.0.1, postcss@^6.0.11:
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
 prettier@^1.13.7, prettier@^1.14.2:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895"
-  integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg==
 
 pretty-format@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"
-  integrity sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
@@ -7598,7 +6604,6 @@ pretty-format@^23.6.0:
 pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
-  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
 
 prismjs@^1.8.4, prismjs@~1.15.0:
   version "1.15.0"
@@ -7609,32 +6614,26 @@ prismjs@^1.8.4, prismjs@~1.15.0:
 private@^0.1.6, private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
 process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
 
 process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
-  integrity sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=
 
 prompts@^0.1.9:
   version "0.1.14"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-0.1.14.tgz#a8e15c612c5c9ec8f8111847df3337c9cbd443b2"
-  integrity sha512-rxkyiE9YH6zAz/rZpywySLKkpaj0NMVyNw1qhsubdbjjSgcayjTShDreZGlFMcGSu5sab3bAKPfFk78PB90+8w==
   dependencies:
     kleur "^2.0.1"
     sisteransi "^0.1.1"
@@ -7642,7 +6641,6 @@ prompts@^0.1.9:
 prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
   version "15.6.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
-  integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==
   dependencies:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
@@ -7656,24 +6654,20 @@ property-information@^4.0.0:
 ps-tree@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014"
-  integrity sha1-tCGyQUDWID8e08dplrRCewjowBQ=
   dependencies:
     event-stream "~3.3.0"
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
   version "1.1.29"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
-  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
@@ -7685,59 +6679,48 @@ public-encrypt@^4.0.0:
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
 punycode@^1.3.2, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 qs@6.2.3:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
-  integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
 
 qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
-  integrity sha1-51vV9uJoEioqDgvaYwslUMFmUCw=
 
 qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 querystring-es3@~0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 raf@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
-  integrity sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==
   dependencies:
     performance-now "^2.1.0"
 
 railroad-diagrams@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
-  integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=
 
 randexp@0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
-  integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==
   dependencies:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
@@ -7745,7 +6728,6 @@ randexp@0.4.6:
 randomatic@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
-  integrity sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ==
   dependencies:
     is-number "^4.0.0"
     kind-of "^6.0.0"
@@ -7754,14 +6736,12 @@ randomatic@^3.0.0:
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
-  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
   dependencies:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
@@ -7769,12 +6749,10 @@ randomfill@^1.0.3:
 range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
 raw-body@^2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
-  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
   dependencies:
     bytes "3.0.0"
     http-errors "1.6.3"
@@ -7784,7 +6762,6 @@ raw-body@^2.3.2:
 rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
@@ -7794,7 +6771,6 @@ rc@^1.2.7:
 react-diff-view@^1.7.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/react-diff-view/-/react-diff-view-1.8.1.tgz#0b9b4adcb92de6730d28177d68654dfcc2097f73"
-  integrity sha512-+soJL85Xnsak/VOdxSgiDKhhaFiOkckiswwrXdiWVCxV3LP9POyJR4AqGVFGdkntJ3YT63mtwTYuunFeId+XSA==
   dependencies:
     classnames "^2.2.6"
     gitdiff-parser "^0.1.2"
@@ -7807,7 +6783,6 @@ react-diff-view@^1.7.0:
 react-dom@^16.4.2:
   version "16.5.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7"
-  integrity sha512-RC8LDw8feuZOHVgzEf7f+cxBr/DnKdqp56VU0lAs1f4UfKc4cU8wU4fTq/mgnvynLQo8OtlPC19NUFh/zjZPuA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -7817,7 +6792,6 @@ react-dom@^16.4.2:
 react-i18next@^7.9.0:
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-7.13.0.tgz#a6f64fd749215ec70400f90da6cbde2a9c5b1588"
-  integrity sha512-35M+MZFPqHwVIas7tXWQKFrf+ozCJukNplUTiGqL8mczSk+VRBsHxxXuuQKRkz/4CcWkONGWbp/AzxfM6wZncg==
   dependencies:
     hoist-non-react-statics "^2.3.1"
     html-parse-stringify2 "2.0.1"
@@ -7826,12 +6800,10 @@ react-i18next@^7.9.0:
 react-is@^16.5.2:
   version "16.5.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.5.2.tgz#e2a7b7c3f5d48062eb769fcb123505eb928722e3"
-  integrity sha512-hSl7E6l25GTjNEZATqZIuWOgSnpXb3kD0DVCujmg46K5zLxsbiKaaT6VO9slkSBDPZfYs30lwfJwbOFOnoEnKQ==
 
 react-jss@^8.6.0:
   version "8.6.1"
   resolved "https://registry.yarnpkg.com/react-jss/-/react-jss-8.6.1.tgz#a06e2e1d2c4d91b4d11befda865e6c07fbd75252"
-  integrity sha512-SH6XrJDJkAphp602J14JTy3puB2Zxz1FkM3bKVE8wON+va99jnUTKWnzGECb3NfIn9JPR5vHykge7K3/A747xQ==
   dependencies:
     hoist-non-react-statics "^2.5.0"
     jss "^9.7.0"
@@ -7842,7 +6814,6 @@ react-jss@^8.6.0:
 react-redux@^5.0.7:
   version "5.0.7"
   resolved "http://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8"
-  integrity sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==
   dependencies:
     hoist-non-react-statics "^2.5.0"
     invariant "^2.0.0"
@@ -7854,7 +6825,6 @@ react-redux@^5.0.7:
 react-router-dom@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"
-  integrity sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==
   dependencies:
     history "^4.7.2"
     invariant "^2.2.4"
@@ -7866,7 +6836,6 @@ react-router-dom@^4.3.1:
 react-router-enzyme-context@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/react-router-enzyme-context/-/react-router-enzyme-context-1.2.0.tgz#7aa11c80e23278fa31f8a29845f7b37760d99350"
-  integrity sha512-z6+PQ6sdOHsRk9u4gSfsbeEuWZeogffrmgHo4dFXX5t/K8mUFftZBJQ+imzL3f3T6rkIIp+J7I0CeREYgcqe9A==
   dependencies:
     history "^4.7.2"
     prop-types "^15.6.0"
@@ -7874,7 +6843,6 @@ react-router-enzyme-context@^1.2.0:
 react-router-redux@^5.0.0-alpha.9:
   version "5.0.0-alpha.9"
   resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-5.0.0-alpha.9.tgz#825431516e0e6f1fd93b8807f6bd595e23ec3d10"
-  integrity sha512-euSgNIANnRXr4GydIuwA7RZCefrLQzIw5WdXspS8NPYbV+FxrKSS9MKG7U9vb6vsKHONnA4VxrVNWfnMUnUQAw==
   dependencies:
     history "^4.7.2"
     prop-types "^15.6.0"
@@ -7883,7 +6851,6 @@ react-router-redux@^5.0.0-alpha.9:
 react-router@^4.2.0, react-router@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e"
-  integrity sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==
   dependencies:
     history "^4.7.2"
     hoist-non-react-statics "^2.5.0"
@@ -7906,7 +6873,6 @@ react-syntax-highlighter@^9.0.1:
 react-test-renderer@^16.0.0-0, react-test-renderer@^16.4.1:
   version "16.5.2"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.5.2.tgz#92e9d2c6f763b9821b2e0b22f994ee675068b5ae"
-  integrity sha512-AGbJYbCVx1J6jdUgI4s0hNp+9LxlgzKvXl0ROA3DHTrtjAr00Po1RhDZ/eAq2VC/ww8AHgpDXULh5V2rhEqqJg==
   dependencies:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
@@ -7916,7 +6882,6 @@ react-test-renderer@^16.0.0-0, react-test-renderer@^16.4.1:
 react@^16.4.2:
   version "16.5.2"
   resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42"
-  integrity sha512-FDCSVd3DjVTmbEAjUNX6FgfAmQ+ypJfHUsqUJOYNCBUp1h8lqmtC+0mXJ+JjsWx4KAVTkk1vKd1hLQPvEviSuw==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -7926,21 +6891,18 @@ react@^16.4.2:
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
   dependencies:
     pify "^2.3.0"
 
 read-only-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
-  integrity sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=
   dependencies:
     readable-stream "^2.0.2"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -7948,7 +6910,6 @@ read-pkg-up@^1.0.1:
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
@@ -7956,7 +6917,6 @@ read-pkg-up@^2.0.0:
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -7965,7 +6925,6 @@ read-pkg@^1.0.0:
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
@@ -7974,7 +6933,6 @@ read-pkg@^2.0.0:
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
@@ -7983,7 +6941,6 @@ read-pkg@^3.0.0:
 "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.31:
   version "1.0.34"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -7993,7 +6950,6 @@ read-pkg@^3.0.0:
 readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.5, readable-stream@^2.3.6:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -8006,7 +6962,6 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable
 readable-stream@~1.1.9:
   version "1.1.14"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -8016,7 +6971,6 @@ readable-stream@~1.1.9:
 readable-stream@~2.1.5:
   version "2.1.5"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
-  integrity sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA=
   dependencies:
     buffer-shims "^1.0.0"
     core-util-is "~1.0.0"
@@ -8029,7 +6983,6 @@ readable-stream@~2.1.5:
 readdirp@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
-  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
   dependencies:
     graceful-fs "^4.1.11"
     micromatch "^3.1.10"
@@ -8038,21 +6991,18 @@ readdirp@^2.0.0:
 realpath-native@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.2.tgz#cd51ce089b513b45cf9b1516c82989b51ccc6560"
-  integrity sha512-+S3zTvVt9yTntFrBpm7TQmQ3tzpCrnA1a/y+3cUHAc9ZR6aIjG0WNLR+Rj79QpJktY+VeW/TQtFlQ1bzsehI8g==
   dependencies:
     util.promisify "^1.0.0"
 
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
@@ -8060,31 +7010,26 @@ redent@^1.0.0:
 redux-devtools-extension@^2.13.5:
   version "2.13.5"
   resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.5.tgz#3ff34f7227acfeef3964194f5f7fc2765e5c5a39"
-  integrity sha512-QQ9BRy77oURHMdGys9rfQcCQDzXZ1T4oW+eUyE5Cg7DNVau69HJzc4YNDMOmpi0Dzpi1zOQgQ2rUpgJta4Lfqg==
 
 redux-logger@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf"
-  integrity sha1-91VZZvMJjzyIYExEnPC69XeCdL8=
   dependencies:
     deep-diff "^0.3.5"
 
 redux-mock-store@^1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/redux-mock-store/-/redux-mock-store-1.5.3.tgz#1f10528949b7ce8056c2532624f7cafa98576c6d"
-  integrity sha512-ryhkkb/4D4CUGpAV2ln1GOY/uh51aczjcRz9k2L2bPx/Xja3c5pSGJJPyR25GNVRXtKIExScdAgFdiXp68GmJA==
   dependencies:
     lodash.isplainobject "^4.0.6"
 
 redux-thunk@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
-  integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
 
 redux@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.0.tgz#aa698a92b729315d22b34a0553d7e6533555cc03"
-  integrity sha512-NnnHF0h0WVE/hXyrB6OlX67LYRuaf/rJcbWvnHHEPCF/Xa/AZpwhs/20WyqzQae5x4SD2F9nPObgBh2rxAgLiA==
   dependencies:
     loose-envify "^1.1.0"
     symbol-observable "^1.2.0"
@@ -8100,43 +7045,36 @@ refractor@^2.4.1:
 regenerate-unicode-properties@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
-  integrity sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==
   dependencies:
     regenerate "^1.4.0"
 
 regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
 regenerator-runtime@^0.10.5:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
-  integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regenerator-transform@^0.13.3:
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
-  integrity sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==
   dependencies:
     private "^0.1.6"
 
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
@@ -8144,12 +7082,10 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 regexpp@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
 regexpu-core@^4.1.3, regexpu-core@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d"
-  integrity sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==
   dependencies:
     regenerate "^1.4.0"
     regenerate-unicode-properties "^7.0.0"
@@ -8161,58 +7097,48 @@ regexpu-core@^4.1.3, regexpu-core@^4.2.0:
 regjsgen@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.4.0.tgz#c1eb4c89a209263f8717c782591523913ede2561"
-  integrity sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==
 
 regjsparser@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.3.0.tgz#3c326da7fcfd69fa0d332575a41c8c0cdf588c96"
-  integrity sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==
   dependencies:
     jsesc "~0.5.0"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
 replace-ext@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
 
 replace-ext@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
 
 request-promise-core@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
-  integrity sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=
   dependencies:
     lodash "^4.13.1"
 
 request-promise-native@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
-  integrity sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=
   dependencies:
     request-promise-core "1.1.1"
     stealthy-require "^1.1.0"
@@ -8221,7 +7147,6 @@ request-promise-native@^1.0.5:
 request@2.79.0:
   version "2.79.0"
   resolved "http://registry.npmjs.org/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  integrity sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=
   dependencies:
     aws-sign2 "~0.6.0"
     aws4 "^1.2.1"
@@ -8247,7 +7172,6 @@ request@2.79.0:
 request@2.87.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
-  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -8273,7 +7197,6 @@ request@2.87.0:
 request@^2.87.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -8299,17 +7222,14 @@ request@^2.87.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
   dependencies:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
@@ -8317,19 +7237,16 @@ require-uncached@^1.0.3:
 requires-port@1.x.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
   dependencies:
     resolve-from "^3.0.0"
 
 resolve-dir@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
-  integrity sha1-shklmlYC+sXFxJatiUpujMQwJh4=
   dependencies:
     expand-tilde "^1.2.2"
     global-modules "^0.2.3"
@@ -8337,7 +7254,6 @@ resolve-dir@^0.1.0:
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
   dependencies:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
@@ -8345,39 +7261,32 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
 resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
 
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 resolve-pathname@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
-  integrity sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
 resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
   dependencies:
     path-parse "^1.0.5"
 
 resp-modifier@6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f"
-  integrity sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08=
   dependencies:
     debug "^2.2.0"
     minimatch "^3.0.2"
@@ -8385,7 +7294,6 @@ resp-modifier@6.0.2:
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -8393,19 +7301,16 @@ restore-cursor@^2.0.0:
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -8413,7 +7318,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
 rst-selector-parser@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
-  integrity sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=
   dependencies:
     lodash.flattendeep "^4.4.0"
     nearley "^2.7.10"
@@ -8421,55 +7325,46 @@ rst-selector-parser@^2.2.3:
 rsvp@^3.3.3:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
-  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
 
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
   dependencies:
     is-promise "^2.1.0"
 
 rx@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
-  integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
 
 rxjs@^5.5.6:
   version "5.5.12"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc"
-  integrity sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==
   dependencies:
     symbol-observable "1.0.1"
 
 rxjs@^6.1.0:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
-  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
   dependencies:
     tslib "^1.9.0"
 
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sane@^2.0.0:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
-  integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o=
   dependencies:
     anymatch "^2.0.0"
     capture-exit "^1.2.0"
@@ -8485,7 +7380,6 @@ sane@^2.0.0:
 sass-graph@^2.1.1, sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
-  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
   dependencies:
     glob "^7.0.0"
     lodash "^4.0.0"
@@ -8495,19 +7389,16 @@ sass-graph@^2.1.1, sass-graph@^2.2.4:
 sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
 schedule@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.5.0.tgz#c128fffa0b402488b08b55ae74bb9df55cc29cc8"
-  integrity sha512-HUcJicG5Ou8xfR//c2rPT0lPIRR09vVvN81T9fqfVgBmhERUbDEQoYKjpBxbueJnCPpSu2ujXzOnRQt6x9o/jw==
   dependencies:
     object-assign "^4.1.1"
 
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
   dependencies:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
@@ -8519,22 +7410,18 @@ select@^1.1.2:
 "semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
-  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
 semver@^4.1.0:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
 
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -8553,12 +7440,10 @@ send@0.16.2:
 sequencify@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
-  integrity sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=
 
 serve-index@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -8571,7 +7456,6 @@ serve-index@1.9.1:
 serve-static@1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
@@ -8581,17 +7465,14 @@ serve-static@1.13.2:
 server-destroy@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
-  integrity sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0=
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -8601,7 +7482,6 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -8611,17 +7491,14 @@ set-value@^2.0.0:
 setimmediate@~1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
 sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4:
   version "2.4.11"
   resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -8629,7 +7506,6 @@ sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4:
 shasum@^1.0.0:
   version "1.0.2"
   resolved "http://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f"
-  integrity sha1-5wEjENj0F/TetXEhUOVni4euVl8=
   dependencies:
     json-stable-stringify "~0.0.0"
     sha.js "~2.4.4"
@@ -8637,19 +7513,16 @@ shasum@^1.0.0:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shell-quote@^1.4.2, shell-quote@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
-  integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
   dependencies:
     array-filter "~0.0.0"
     array-map "~0.0.0"
@@ -8659,44 +7532,36 @@ shell-quote@^1.4.2, shell-quote@^1.6.1:
 shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
-  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
 sigmund@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
 simple-concat@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
-  integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=
 
 sisteransi@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
-  integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 slice-ansi@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
-  integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -8705,14 +7570,12 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -8726,19 +7589,16 @@ snapdragon@^0.8.1:
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
   dependencies:
     hoek "2.x.x"
 
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
-  integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
 
 socket.io-client@2.1.1, socket.io-client@^2.0.4:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
-  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
   dependencies:
     backo2 "1.0.2"
     base64-arraybuffer "0.1.5"
@@ -8758,7 +7618,6 @@ socket.io-client@2.1.1, socket.io-client@^2.0.4:
 socket.io-parser@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
-  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
   dependencies:
     component-emitter "1.2.1"
     debug "~3.1.0"
@@ -8767,7 +7626,6 @@ socket.io-parser@~3.2.0:
 socket.io@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
-  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
   dependencies:
     debug "~3.1.0"
     engine.io "~3.2.0"
@@ -8779,7 +7637,6 @@ socket.io@2.1.1:
 source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -8790,14 +7647,12 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
 source-map-support@^0.4.15:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
   dependencies:
     source-map "^0.5.6"
 
 source-map-support@^0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
-  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -8805,24 +7660,20 @@ source-map-support@^0.5.6:
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.3:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 space-separated-tokens@^1.0.0:
   version "1.1.2"
@@ -8833,12 +7684,10 @@ space-separated-tokens@^1.0.0:
 sparkles@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
-  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
 
 spdx-correct@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.2.tgz#19bb409e91b47b1ad54159243f7312a858db3c2e"
-  integrity sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -8846,12 +7695,10 @@ spdx-correct@^3.0.0:
 spdx-exceptions@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
-  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
@@ -8859,31 +7706,26 @@ spdx-expression-parse@^3.0.0:
 spdx-license-ids@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
-  integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 split@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
-  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
   version "1.14.2"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
-  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -8899,12 +7741,10 @@ sshpk@^1.7.0:
 stack-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
-  integrity sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=
 
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -8912,34 +7752,28 @@ static-extend@^0.1.1:
 "statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
 
 statuses@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
 stdout-stream@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
-  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
   dependencies:
     readable-stream "^2.0.1"
 
 stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
 stream-browserify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -8947,7 +7781,6 @@ stream-browserify@^2.0.0:
 stream-combiner2@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
-  integrity sha1-+02KFCDqNidk4hrUeAOXvry0HL4=
   dependencies:
     duplexer2 "~0.1.0"
     readable-stream "^2.0.2"
@@ -8955,7 +7788,6 @@ stream-combiner2@^1.1.1:
 stream-combiner@^0.2.2:
   version "0.2.2"
   resolved "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
-  integrity sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=
   dependencies:
     duplexer "~0.1.1"
     through "~2.3.4"
@@ -8963,12 +7795,10 @@ stream-combiner@^0.2.2:
 stream-consume@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48"
-  integrity sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==
 
 stream-http@^2.0.0:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
-  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -8979,7 +7809,6 @@ stream-http@^2.0.0:
 stream-splicer@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.0.tgz#1b63be438a133e4b671cc1935197600175910d83"
-  integrity sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
@@ -8987,7 +7816,6 @@ stream-splicer@^2.0.0:
 stream-throttle@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3"
-  integrity sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM=
   dependencies:
     commander "^2.2.0"
     limiter "^1.0.5"
@@ -8995,7 +7823,6 @@ stream-throttle@^0.1.3:
 string-length@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
-  integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=
   dependencies:
     astral-regex "^1.0.0"
     strip-ansi "^4.0.0"
@@ -9003,7 +7830,6 @@ string-length@^2.0.0:
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -9012,7 +7838,6 @@ string-width@^1.0.1, string-width@^1.0.2:
 "string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
@@ -9020,7 +7845,6 @@ string-width@^1.0.1, string-width@^1.0.2:
 string.prototype.padend@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
-  integrity sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.4.3"
@@ -9029,7 +7853,6 @@ string.prototype.padend@^3.0.0:
 string.prototype.trim@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
-  integrity sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.5.0"
@@ -9038,48 +7861,40 @@ string.prototype.trim@^1.1.2:
 string_decoder@^1.1.1, string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
 stringstream@~0.0.4:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
-  integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-bom-string@1.X:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
-  integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=
 
 strip-bom@3.0.0, strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-bom@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
-  integrity sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=
   dependencies:
     first-chunk-stream "^1.0.0"
     is-utf8 "^0.2.0"
@@ -9087,86 +7902,72 @@ strip-bom@^1.0.0:
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-css-comments@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz#7a5625eff8a2b226cf8947a11254da96e13dae89"
-  integrity sha1-elYl7/iisibPiUehElTaluE9rok=
   dependencies:
     is-regexp "^1.0.0"
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
 strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 subarg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
-  integrity sha1-9izxdYHplrSPyWVpn1TAauJouNI=
   dependencies:
     minimist "^1.1.0"
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^3.1.2:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
   dependencies:
     has-flag "^1.0.0"
 
 supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
 symbol-observable@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
-  integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
 
 symbol-observable@^1.1.0, symbol-observable@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
 symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
-  integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=
 
 syntax-error@^1.1.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c"
-  integrity sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==
   dependencies:
     acorn-node "^1.2.0"
 
 table@^4.0.2, table@^4.0.3:
   version "4.0.3"
   resolved "http://registry.npmjs.org/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
-  integrity sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==
   dependencies:
     ajv "^6.0.1"
     ajv-keywords "^3.0.0"
@@ -9178,7 +7979,6 @@ table@^4.0.2, table@^4.0.3:
 tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
@@ -9187,7 +7987,6 @@ tar@^2.0.0:
 tar@^4:
   version "4.4.6"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
   dependencies:
     chownr "^1.0.1"
     fs-minipass "^1.2.5"
@@ -9200,7 +7999,6 @@ tar@^4:
 test-exclude@^4.2.1:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20"
-  integrity sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==
   dependencies:
     arrify "^1.0.1"
     micromatch "^2.3.11"
@@ -9211,12 +8009,10 @@ test-exclude@^4.2.1:
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
 tfunk@^3.0.1:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/tfunk/-/tfunk-3.1.0.tgz#38e4414fc64977d87afdaa72facb6d29f82f7b5b"
-  integrity sha1-OORBT8ZJd9h6/apy+sttKfgve1s=
   dependencies:
     chalk "^1.1.1"
     object-path "^0.9.0"
@@ -9224,7 +8020,6 @@ tfunk@^3.0.1:
 theming@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/theming/-/theming-1.3.0.tgz#286d5bae80be890d0adc645e5ca0498723725bdc"
-  integrity sha512-ya5Ef7XDGbTPBv5ENTwrwkPUexrlPeiAg/EI9kdlUAZhNlRbCdhMKRgjNX1IcmsmiPcqDQZE6BpSaH+cr31FKw==
   dependencies:
     brcast "^3.0.1"
     is-function "^1.0.1"
@@ -9234,12 +8029,10 @@ theming@^1.3.0:
 throat@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
-  integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
 
 through2@2.0.x, through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
@@ -9247,7 +8040,6 @@ through2@2.0.x, through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.3:
 through2@^0.6.1:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
   dependencies:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
@@ -9255,36 +8047,30 @@ through2@^0.6.1:
 through@2, "through@>=2.2.7 <3", through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.4:
   version "2.3.8"
   resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 tildify@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
-  integrity sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=
   dependencies:
     os-homedir "^1.0.0"
 
 time-stamp@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
 
 timed-out@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
 
 timers-browserify@^1.0.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d"
-  integrity sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=
   dependencies:
     process "~0.11.0"
 
 timers-ext@^0.1.5:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
-  integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
   dependencies:
     es5-ext "~0.10.46"
     next-tick "1"
@@ -9296,46 +8082,38 @@ tiny-emitter@^2.0.0:
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
-  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -9343,7 +8121,6 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
@@ -9353,7 +8130,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
   dependencies:
     psl "^1.1.24"
     punycode "^1.4.1"
@@ -9361,36 +8137,30 @@ tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.4.3:
 tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
   dependencies:
     punycode "^1.4.1"
 
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
-  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
   dependencies:
     punycode "^2.1.0"
 
 "traverse@>=0.3.0 <0.4":
   version "0.3.9"
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
-  integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
 
 traverse@^0.6.6:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
-  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
 
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
 trim@0.0.1:
   version "0.0.1"
@@ -9399,58 +8169,48 @@ trim@0.0.1:
 "true-case-path@^1.0.2":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
-  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
   dependencies:
     glob "^7.1.2"
 
 tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tty-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
-  integrity sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tunnel-agent@~0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 ua-parser-js@0.7.17:
   version "0.7.17"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
-  integrity sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g==
 
 uglify-js@^3.0.5, uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
-  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
@@ -9458,22 +8218,18 @@ uglify-js@^3.0.5, uglify-js@^3.1.4:
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
-  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
 umd@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf"
-  integrity sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==
 
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
 undeclared-identifiers@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz#7d850a98887cff4bd0bf64999c014d08ed6d1acc"
-  integrity sha512-13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ==
   dependencies:
     acorn-node "^1.3.0"
     get-assigned-identifiers "^1.2.0"
@@ -9483,17 +8239,14 @@ undeclared-identifiers@^1.1.2:
 underscore@~1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
-  integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ=
 
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
 
 unicode-match-property-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
   dependencies:
     unicode-canonical-property-names-ecmascript "^1.0.4"
     unicode-property-aliases-ecmascript "^1.0.4"
@@ -9501,17 +8254,14 @@ unicode-match-property-ecmascript@^1.0.4:
 unicode-match-property-value-ecmascript@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
-  integrity sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==
 
 unicode-property-aliases-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
-  integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==
 
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
@@ -9521,29 +8271,24 @@ union-value@^1.0.0:
 unique-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
-  integrity sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=
 
 universal-user-agent@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.0.1.tgz#18e591ca52b1cb804f6b9cbc4c336cf8191f80e1"
-  integrity sha512-vz+heWVydO0iyYAa65VHD7WZkYzhl7BeNVy4i54p4TF8OMiLSXdbuQe4hm+fmWAsL+rVibaQHXfhvkw3c1Ws2w==
   dependencies:
     os-name "^2.0.1"
 
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -9551,7 +8296,6 @@ unset-value@^1.0.0:
 unzipper@^0.8.11:
   version "0.8.14"
   resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.8.14.tgz#ade0524cd2fc14d11b8de258be22f9d247d3f79b"
-  integrity sha512-8rFtE7EP5ssOwGpN2dt1Q4njl0N1hUXJ7sSPz0leU2hRdq6+pra57z4YPBlVqm40vcgv6ooKZEAx48fMTv9x4w==
   dependencies:
     big-integer "^1.6.17"
     binary "~0.3.0"
@@ -9566,41 +8310,34 @@ unzipper@^0.8.11:
 upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
 
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-parse-lax@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
   dependencies:
     prepend-http "^1.0.1"
 
 url-template@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
-  integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE=
 
 url-to-options@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
-  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
 
 url@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -9608,22 +8345,18 @@ url@~0.11.0:
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
-  integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA=
 
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util.promisify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
   dependencies:
     define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
@@ -9631,38 +8364,32 @@ util.promisify@^1.0.0:
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
 util@~0.10.1:
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
-  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
   dependencies:
     inherits "2.0.3"
 
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
 uuid@^3.0.0, uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
 v8flags@^2.0.2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
-  integrity sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=
   dependencies:
     user-home "^1.1.1"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -9670,12 +8397,10 @@ validate-npm-package-license@^3.0.1:
 value-equal@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
-  integrity sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -9684,7 +8409,6 @@ verror@1.10.0:
 vinyl-buffer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vinyl-buffer/-/vinyl-buffer-1.0.1.tgz#96c1a3479b8c5392542c612029013b5b27f88bbf"
-  integrity sha1-lsGjR5uMU5JULGEgKQE7Wyf4i78=
   dependencies:
     bl "^1.2.1"
     through2 "^2.0.3"
@@ -9692,7 +8416,6 @@ vinyl-buffer@^1.0.1:
 vinyl-fs@^0.3.0:
   version "0.3.14"
   resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
-  integrity sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=
   dependencies:
     defaults "^1.0.0"
     glob-stream "^3.1.5"
@@ -9706,7 +8429,6 @@ vinyl-fs@^0.3.0:
 vinyl-source-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-2.0.0.tgz#f38a5afb9dd1e93b65d550469ac6182ac4f54b8e"
-  integrity sha1-84pa+53R6Ttl1VBGmsYYKsT1S44=
   dependencies:
     through2 "^2.0.3"
     vinyl "^2.1.0"
@@ -9714,14 +8436,12 @@ vinyl-source-stream@^2.0.0:
 vinyl-sourcemaps-apply@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
-  integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=
   dependencies:
     source-map "^0.5.1"
 
 vinyl@^0.4.0:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc=
   dependencies:
     clone "^0.2.0"
     clone-stats "^0.0.1"
@@ -9729,7 +8449,6 @@ vinyl@^0.4.0:
 vinyl@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
   dependencies:
     clone "^1.0.0"
     clone-stats "^0.0.1"
@@ -9738,7 +8457,6 @@ vinyl@^0.5.0:
 vinyl@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
-  integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
   dependencies:
     clone "^2.1.1"
     clone-buffer "^1.0.0"
@@ -9750,45 +8468,38 @@ vinyl@^2.1.0:
 vm-browserify@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
-  integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
 
 void-elements@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
 w3c-hr-time@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
-  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
   dependencies:
     browser-process-hrtime "^0.1.2"
 
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
-  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
   dependencies:
     makeerror "1.0.x"
 
 warning@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
-  integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=
   dependencies:
     loose-envify "^1.0.0"
 
 warning@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.2.tgz#aa6876480872116fa3e11d434b0d0d8d91e44607"
-  integrity sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==
   dependencies:
     loose-envify "^1.0.0"
 
 watch@~0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
-  integrity sha1-KAlUdsbffJDJYxOJkMClQj60uYY=
   dependencies:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
@@ -9796,7 +8507,6 @@ watch@~0.18.0:
 watchify@^3.11.0:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/watchify/-/watchify-3.11.0.tgz#03f1355c643955e7ab8dcbf399f624644221330f"
-  integrity sha512-7jWG0c3cKKm2hKScnSAMUEUjRJKXUShwMPk0ASVhICycQhwND3IMAdhJYmc1mxxKzBUJTSF5HZizfrKrS6BzkA==
   dependencies:
     anymatch "^1.3.0"
     browserify "^16.1.0"
@@ -9809,29 +8519,24 @@ watchify@^3.11.0:
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
-  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
   dependencies:
     iconv-lite "0.4.24"
 
 whatwg-fetch@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
-  integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
 
 whatwg-mimetype@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.2.0.tgz#a3d58ef10b76009b042d03e25591ece89b88d171"
-  integrity sha512-5YSO1nMd5D1hY3WzAQV3PzZL83W3YeyR1yW9PcH26Weh1t+Vzh9B6XkDh7aXm83HBZ4nSMvkjvN2H2ySWIvBgw==
 
 whatwg-url@^6.4.1:
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
-  integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^1.0.1"
@@ -9840,7 +8545,6 @@ whatwg-url@^6.4.1:
 whatwg-url@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
-  integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^1.0.1"
@@ -9849,53 +8553,44 @@ whatwg-url@^7.0.0:
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
 which@1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
 win-release@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/win-release/-/win-release-1.1.1.tgz#5fa55e02be7ca934edfc12665632e849b72e5209"
-  integrity sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=
   dependencies:
     semver "^5.0.1"
 
 window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
-  integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -9903,12 +8598,10 @@ wrap-ansi@^2.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
-  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -9917,21 +8610,18 @@ write-file-atomic@^2.1.0:
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
   dependencies:
     mkdirp "^0.5.1"
 
 ws@^5.2.0:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
-  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
   dependencies:
     async-limiter "~1.0.0"
 
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
-  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
@@ -9940,12 +8630,10 @@ ws@~3.3.1:
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
-  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
 xml2js@^0.4.9:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
-  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
   dependencies:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
@@ -9953,42 +8641,34 @@ xml2js@^0.4.9:
 xml@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
 
 xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
-  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
 
 yargs-parser@^2.4.1:
   version "2.4.1"
   resolved "http://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4"
-  integrity sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=
   dependencies:
     camelcase "^3.0.0"
     lodash.assign "^4.0.6"
@@ -9996,28 +8676,24 @@ yargs-parser@^2.4.1:
 yargs-parser@^4.1.0, yargs-parser@^4.2.0:
   version "4.2.1"
   resolved "http://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
-  integrity sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=
   dependencies:
     camelcase "^3.0.0"
 
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
-  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
   dependencies:
     camelcase "^3.0.0"
 
 yargs-parser@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
-  integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=
   dependencies:
     camelcase "^4.1.0"
 
 yargs@6.4.0:
   version "6.4.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-6.4.0.tgz#816e1a866d5598ccf34e5596ddce22d92da490d4"
-  integrity sha1-gW4ahm1VmMzzTlWW3c4i2S2kkNQ=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -10037,7 +8713,6 @@ yargs@6.4.0:
 yargs@6.6.0:
   version "6.6.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
-  integrity sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -10056,7 +8731,6 @@ yargs@6.6.0:
 yargs@^11.0.0:
   version "11.1.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
-  integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==
   dependencies:
     cliui "^4.0.0"
     decamelize "^1.1.1"
@@ -10074,7 +8748,6 @@ yargs@^11.0.0:
 yargs@^4.2.0:
   version "4.8.1"
   resolved "http://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"
-  integrity sha1-wMQpJMpKqmsObaFznfshZDn53cA=
   dependencies:
     cliui "^3.2.0"
     decamelize "^1.1.1"
@@ -10094,7 +8767,6 @@ yargs@^4.2.0:
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -10113,4 +8785,3 @@ yargs@^7.0.0:
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=

From cf05235dfa8db72bed864119039e52278ee48737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 6 Nov 2018 09:14:20 +0100
Subject: [PATCH 101/188] Add context to InternalRepositoryException

---
 .../src/main/java/sonia/scm/ContextEntry.java |  8 +++++
 .../java/sonia/scm/ExceptionWithContext.java  |  5 ++++
 .../AbstractSimpleRepositoryHandler.java      |  3 +-
 .../InternalRepositoryException.java          | 29 ++++++++++++++-----
 .../java/sonia/scm/repository/GitUtil.java    |  3 +-
 .../AbstractGitIncomingOutgoingCommand.java   |  8 +----
 .../spi/AbstractGitPushOrPullCommand.java     |  2 +-
 .../scm/repository/spi/GitBlameCommand.java   |  9 +++---
 .../repository/spi/GitBranchesCommand.java    |  2 +-
 .../scm/repository/spi/GitLogCommand.java     |  2 +-
 .../spi/GitModificationsCommand.java          | 13 ++++-----
 .../scm/repository/spi/GitPullCommand.java    |  2 +-
 .../scm/repository/spi/GitTagsCommand.java    |  2 +-
 .../UnsupportedModificationTypeException.java |  5 ++--
 .../scm/repository/AbstractHgHandler.java     |  2 +-
 .../scm/repository/spi/HgCatCommand.java      |  8 ++++-
 .../scm/repository/spi/HgIncomingCommand.java |  2 +-
 .../scm/repository/spi/HgOutgoingCommand.java |  2 +-
 .../scm/repository/spi/HgPullCommand.java     |  2 +-
 .../scm/repository/spi/HgPushCommand.java     |  2 +-
 .../scm/repository/SvnRepositoryHandler.java  |  5 +++-
 .../scm/repository/spi/SvnBlameCommand.java   |  2 +-
 .../scm/repository/spi/SvnCatCommand.java     |  4 +--
 .../scm/repository/spi/SvnDiffCommand.java    |  2 +-
 .../scm/repository/spi/SvnLogCommand.java     |  4 +--
 .../spi/SvnModificationsCommand.java          |  2 +-
 .../api/rest/ContextualExceptionMapper.java   |  2 +-
 .../v2/resources/FileHistoryRootResource.java | 11 ++++---
 .../InternalRepositoryExceptionMapper.java    | 10 ++++---
 .../repository/DefaultRepositoryManager.java  |  6 ++--
 .../scm/api/v2/resources/DispatcherMock.java  |  2 +-
 .../v2/resources/FileHistoryResourceTest.java | 10 +++----
 .../resources/ModificationsResourceTest.java  |  8 ++---
 33 files changed, 106 insertions(+), 73 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/ContextEntry.java b/scm-core/src/main/java/sonia/scm/ContextEntry.java
index 591f29972a..bbd2fadc5d 100644
--- a/scm-core/src/main/java/sonia/scm/ContextEntry.java
+++ b/scm-core/src/main/java/sonia/scm/ContextEntry.java
@@ -35,6 +35,14 @@ public class ContextEntry {
   public static class ContextBuilder {
     private final List<ContextEntry> context = new LinkedList<>();
 
+    public static List<ContextEntry> noContext() {
+      return new ContextBuilder().build();
+    }
+
+    public static List<ContextEntry> only(String type, String id) {
+      return new ContextBuilder().in(type, id).build();
+    }
+
     public static ContextBuilder entity(Repository repository) {
       return new ContextBuilder().in(repository.getNamespaceAndName());
     }
diff --git a/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java b/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
index 255738455c..dd87b77210 100644
--- a/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
+++ b/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
@@ -13,6 +13,11 @@ public abstract class ExceptionWithContext extends RuntimeException {
     this.context = context;
   }
 
+  public ExceptionWithContext(List<ContextEntry> context, String message, Exception cause) {
+    super(message, cause);
+    this.context = context;
+  }
+
   public List<ContextEntry> getContext() {
     return unmodifiableList(context);
   }
diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
index 997413aacb..6cfa08975e 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
@@ -40,6 +40,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.AlreadyExistsException;
 import sonia.scm.ConfigurationException;
+import sonia.scm.ContextEntry;
 import sonia.scm.io.CommandResult;
 import sonia.scm.io.ExtendedCommand;
 import sonia.scm.io.FileSystem;
@@ -128,7 +129,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
       try {
         fileSystem.destroy(directory);
       } catch (IOException e) {
-        throw new InternalRepositoryException("could not delete repository directory", e);
+        throw new InternalRepositoryException(ContextEntry.ContextBuilder.entity("directory", directory.toString()).in(repository), "could not delete repository directory", e);
       }
       cleanupEmptyDirectories(config.getRepositoryDirectory(),
         directory.getParentFile());
diff --git a/scm-core/src/main/java/sonia/scm/repository/InternalRepositoryException.java b/scm-core/src/main/java/sonia/scm/repository/InternalRepositoryException.java
index d397028d7e..76485daf56 100644
--- a/scm-core/src/main/java/sonia/scm/repository/InternalRepositoryException.java
+++ b/scm-core/src/main/java/sonia/scm/repository/InternalRepositoryException.java
@@ -1,15 +1,30 @@
 package sonia.scm.repository;
 
-public class InternalRepositoryException extends RuntimeException {
-  public InternalRepositoryException(Throwable ex) {
-    super(ex);
+import sonia.scm.ContextEntry;
+import sonia.scm.ExceptionWithContext;
+
+import java.util.List;
+
+public class InternalRepositoryException extends ExceptionWithContext {
+
+  public InternalRepositoryException(ContextEntry.ContextBuilder context, String message) {
+    this(context, message, null);
   }
 
-  public InternalRepositoryException(String msg, Exception ex) {
-    super(msg, ex);
+  public InternalRepositoryException(ContextEntry.ContextBuilder context, String message, Exception cause) {
+    this(context.build(), message, cause);
   }
 
-  public InternalRepositoryException(String message) {
-    super(message);
+  public InternalRepositoryException(Repository repository, String message, Exception cause) {
+    this(ContextEntry.ContextBuilder.entity(repository), message, cause);
+  }
+
+  public InternalRepositoryException(List<ContextEntry> context, String message, Exception cause) {
+    super(context, message, cause);
+  }
+
+  @Override
+  public String getCode() {
+    return null;
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
index 13340a20e7..4524822a6a 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
@@ -55,6 +55,7 @@ import org.eclipse.jgit.treewalk.TreeWalk;
 import org.eclipse.jgit.util.FS;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sonia.scm.ContextEntry;
 import sonia.scm.util.HttpUtil;
 import sonia.scm.util.Util;
 import sonia.scm.web.GitUserAgentProvider;
@@ -203,7 +204,7 @@ public final class GitUtil
     }
     catch (GitAPIException ex)
     {
-      throw new InternalRepositoryException("could not fetch", ex);
+      throw new InternalRepositoryException(ContextEntry.ContextBuilder.entity("remote", directory.toString()).in(remoteRepository), "could not fetch", ex);
     }
   }
 
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitIncomingOutgoingCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitIncomingOutgoingCommand.java
index e90a1c11ed..3cf72166ea 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitIncomingOutgoingCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitIncomingOutgoingCommand.java
@@ -160,7 +160,7 @@ public abstract class AbstractGitIncomingOutgoingCommand
       }
       catch (Exception ex)
       {
-        throw new InternalRepositoryException("could not execute incoming command", ex);
+        throw new InternalRepositoryException(repository, "could not execute incoming command", ex);
       }
       finally
       {
@@ -200,13 +200,7 @@ public abstract class AbstractGitIncomingOutgoingCommand
         {
           if (e.getKey().startsWith(prefix))
           {
-            if (ref != null)
-            {
-              throw new InternalRepositoryException("could not find remote branch");
-            }
-
             ref = e.getValue();
-
             break;
           }
         }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitPushOrPullCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitPushOrPullCommand.java
index 75050c26ea..e4e37d6fed 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitPushOrPullCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitPushOrPullCommand.java
@@ -114,7 +114,7 @@ public abstract class AbstractGitPushOrPullCommand extends AbstractGitCommand
     }
     catch (Exception ex)
     {
-      throw new InternalRepositoryException("could not execute push/pull command", ex);
+      throw new InternalRepositoryException(repository, "could not execute push/pull command", ex);
     }
 
     return counter;
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBlameCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBlameCommand.java
index f50f245963..2ad38648da 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBlameCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBlameCommand.java
@@ -55,6 +55,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+
 //~--- JDK imports ------------------------------------------------------------
 
 /**
@@ -108,9 +110,8 @@ public class GitBlameCommand extends AbstractGitCommand implements BlameCommand
 
       if (gitBlameResult == null)
       {
-        throw new InternalRepositoryException(
-            "could not create blame result for path ".concat(
-              request.getPath()));
+        throw new InternalRepositoryException(entity("path", request.getPath()).in(repository),
+            "could not create blame result for path");
       }
 
       List<BlameLine> blameLines = new ArrayList<BlameLine>();
@@ -150,7 +151,7 @@ public class GitBlameCommand extends AbstractGitCommand implements BlameCommand
     }
     catch (GitAPIException ex)
     {
-      throw new InternalRepositoryException("could not create blame view", ex);
+      throw new InternalRepositoryException(repository, "could not create blame view", ex);
     }
 
     return result;
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchesCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchesCommand.java
index 0cc47100de..4922752b6f 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchesCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchesCommand.java
@@ -102,7 +102,7 @@ public class GitBranchesCommand extends AbstractGitCommand
     }
     catch (GitAPIException ex)
     {
-      throw new InternalRepositoryException("could not read branches", ex);
+      throw new InternalRepositoryException(repository, "could not read branches", ex);
     }
 
     return branches;
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
index 8a3745dce7..f8a5b79a8b 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
@@ -254,7 +254,7 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
     }
     catch (Exception ex)
     {
-      throw new InternalRepositoryException("could not create change log", ex);
+      throw new InternalRepositoryException(repository, "could not create change log", ex);
     }
     finally
     {
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModificationsCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModificationsCommand.java
index 2b35ba74f6..5040069c12 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModificationsCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModificationsCommand.java
@@ -17,6 +17,8 @@ import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.List;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+
 
 @Slf4j
 public class GitModificationsCommand extends AbstractGitCommand implements ModificationsCommand {
@@ -26,7 +28,7 @@ public class GitModificationsCommand extends AbstractGitCommand implements Modif
   }
 
   private Modifications createModifications(TreeWalk treeWalk, RevCommit commit, RevWalk revWalk, String revision)
-    throws IOException, UnsupportedModificationTypeException {
+    throws IOException {
     treeWalk.reset();
     treeWalk.setRecursive(true);
     if (commit.getParentCount() > 0) {
@@ -73,12 +75,7 @@ public class GitModificationsCommand extends AbstractGitCommand implements Modif
       }
     } catch (IOException ex) {
       log.error("could not open repository", ex);
-      throw new InternalRepositoryException(ex);
-
-    } catch (UnsupportedModificationTypeException ex) {
-      log.error("Unsupported modification type", ex);
-      throw new InternalRepositoryException(ex);
-
+      throw new InternalRepositoryException(entity(repository), "could not open repository", ex);
     } finally {
       GitUtil.release(revWalk);
       GitUtil.close(gitRepository);
@@ -100,7 +97,7 @@ public class GitModificationsCommand extends AbstractGitCommand implements Modif
     } else if (type == DiffEntry.ChangeType.DELETE) {
       modifications.getRemoved().add(entry.getOldPath());
     } else {
-      throw new UnsupportedModificationTypeException(MessageFormat.format("The modification type: {0} is not supported.", type));
+      throw new UnsupportedModificationTypeException(entity(repository), MessageFormat.format("The modification type: {0} is not supported.", type));
     }
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java
index a7b341ff5d..bb06e1fd9d 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java
@@ -249,7 +249,7 @@ public class GitPullCommand extends AbstractGitPushOrPullCommand
     }
     catch (GitAPIException ex)
     {
-      throw new InternalRepositoryException("error durring pull", ex);
+      throw new InternalRepositoryException(repository, "error during pull", ex);
     }
 
     return response;
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitTagsCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitTagsCommand.java
index 02fee3cef0..807ec807e6 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitTagsCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitTagsCommand.java
@@ -95,7 +95,7 @@ public class GitTagsCommand extends AbstractGitCommand implements TagsCommand
     }
     catch (GitAPIException ex)
     {
-      throw new InternalRepositoryException("could not read tags from repository", ex);
+      throw new InternalRepositoryException(repository, "could not read tags from repository", ex);
     }
     finally
     {
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/UnsupportedModificationTypeException.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/UnsupportedModificationTypeException.java
index 5081a29d21..85119a3e9f 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/UnsupportedModificationTypeException.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/UnsupportedModificationTypeException.java
@@ -1,9 +1,10 @@
 package sonia.scm.repository.spi;
 
+import sonia.scm.ContextEntry;
 import sonia.scm.repository.InternalRepositoryException;
 
 public class UnsupportedModificationTypeException extends InternalRepositoryException {
-  public UnsupportedModificationTypeException(String message) {
-    super(message);
+  public UnsupportedModificationTypeException(ContextEntry.ContextBuilder entity, String message) {
+    super(entity, message);
   }
 }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java
index 19cfd37665..4115a514a2 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java
@@ -272,7 +272,7 @@ public class AbstractHgHandler
     } catch (JAXBException ex) {
       logger.error("could not parse result", ex);
 
-      throw new InternalRepositoryException("could not parse result", ex);
+      throw new InternalRepositoryException(repository, "could not parse result", ex);
     }
   }
 
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgCatCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgCatCommand.java
index 554d6aaf05..6309720f75 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgCatCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgCatCommand.java
@@ -36,6 +36,9 @@ package sonia.scm.repository.spi;
 import com.aragost.javahg.commands.ExecutionException;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Closeables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sonia.scm.ContextEntry;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Repository;
 import sonia.scm.web.HgUtil;
@@ -46,6 +49,8 @@ import java.io.OutputStream;
 
 public class HgCatCommand extends AbstractCommand implements CatCommand {
 
+  private static final Logger log = LoggerFactory.getLogger(HgCatCommand.class);
+
   HgCatCommand(HgCommandContext context, Repository repository) {
     super(context, repository);
   }
@@ -70,7 +75,8 @@ public class HgCatCommand extends AbstractCommand implements CatCommand {
     try {
       return cmd.execute(request.getPath());
     } catch (ExecutionException e) {
-      throw new InternalRepositoryException(e);
+      log.error("could not execute cat command", e);
+      throw new InternalRepositoryException(ContextEntry.ContextBuilder.entity(getRepository()), "could not execute cat command", e);
     }
   }
 }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java
index 55cf0fbe01..c60f2c5712 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java
@@ -103,7 +103,7 @@ public class HgIncomingCommand extends AbstractCommand
       }
       else
       {
-        throw new InternalRepositoryException("could not execute incoming command", ex);
+        throw new InternalRepositoryException(getRepository(), "could not execute incoming command", ex);
       }
     }
 
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java
index b476b6c2ab..81bee6b9ff 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java
@@ -103,7 +103,7 @@ public class HgOutgoingCommand extends AbstractCommand
       }
       else
       {
-        throw new InternalRepositoryException("could not execute outgoing command", ex);
+        throw new InternalRepositoryException(getRepository(), "could not execute outgoing command", ex);
       }
     }
 
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPullCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPullCommand.java
index 0eb23ef4e7..1d130a0f79 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPullCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPullCommand.java
@@ -97,7 +97,7 @@ public class HgPullCommand extends AbstractHgPushOrPullCommand
     }
     catch (ExecutionException ex)
     {
-      throw new InternalRepositoryException("could not execute push command", ex);
+      throw new InternalRepositoryException(getRepository(), "could not execute push command", ex);
     }
 
     return new PullResponse(result.size());
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPushCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPushCommand.java
index fb0a1a1c73..b1c12037db 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPushCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPushCommand.java
@@ -97,7 +97,7 @@ public class HgPushCommand extends AbstractHgPushOrPullCommand
     }
     catch (ExecutionException ex)
     {
-      throw new InternalRepositoryException("could not execute push command", ex);
+      throw new InternalRepositoryException(getRepository(), "could not execute push command", ex);
     }
 
     return new PushResponse(result.size());
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
index 7d5c9695c9..cd242faa2d 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
@@ -56,6 +56,8 @@ import sonia.scm.util.Util;
 
 import java.io.File;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+
 //~--- JDK imports ------------------------------------------------------------
 
 /**
@@ -173,7 +175,8 @@ public class SvnRepositoryHandler
     }
     catch (SVNException ex)
     {
-      throw new InternalRepositoryException(ex);
+      logger.error("could not create svn repository", ex);
+      throw new InternalRepositoryException(entity(repository), "could not create repository", ex);
     }
     finally
     {
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBlameCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBlameCommand.java
index fe9a72ffce..b589734d03 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBlameCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBlameCommand.java
@@ -98,7 +98,7 @@ public class SvnBlameCommand extends AbstractSvnCommand implements BlameCommand
     }
     catch (SVNException ex)
     {
-      throw new InternalRepositoryException("could not create blame result", ex);
+      throw new InternalRepositoryException(repository, "could not create blame result", ex);
     }
 
     return new BlameResult(blameLines.size(), blameLines);
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnCatCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnCatCommand.java
index 9a5c39af46..9ee43b2259 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnCatCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnCatCommand.java
@@ -137,7 +137,7 @@ public class SvnCatCommand extends AbstractSvnCommand implements CatCommand
     } else if (SVNErrorCode.FS_NO_SUCH_REVISION.getCode() == svnErrorCode) {
       throw notFound(entity("Revision", request.getRevision()).in(repository));
     } else {
-      throw new InternalRepositoryException("could not get content from revision", ex);
+      throw new InternalRepositoryException(repository, "could not get content from revision", ex);
     }
   }
 
@@ -157,7 +157,7 @@ public class SvnCatCommand extends AbstractSvnCommand implements CatCommand
     }
     catch (SVNException ex)
     {
-      throw new InternalRepositoryException("could not get content from transaction", ex);
+      throw new InternalRepositoryException(repository, "could not get content from transaction", ex);
     }
     finally
     {
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java
index 9e81f1a7a9..8418fd63b8 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java
@@ -120,7 +120,7 @@ public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand
     }
     catch (SVNException ex)
     {
-      throw new InternalRepositoryException("could not create diff", ex);
+      throw new InternalRepositoryException(repository, "could not create diff", ex);
     }
     finally
     {
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java
index a29b8f4a0c..be102be1bd 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java
@@ -97,7 +97,7 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
     }
     catch (SVNException ex)
     {
-      throw new InternalRepositoryException("could not open repository", ex);
+      throw new InternalRepositoryException(repository, "could not open repository", ex);
     }
 
     return changeset;
@@ -139,7 +139,7 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
     }
     catch (SVNException ex)
     {
-      throw new InternalRepositoryException("could not open repository", ex);
+      throw new InternalRepositoryException(repository, "could not open repository", ex);
     }
 
     return changesets;
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModificationsCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModificationsCommand.java
index 00fb1dc5a0..4b4f655b12 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModificationsCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModificationsCommand.java
@@ -34,7 +34,7 @@ public class SvnModificationsCommand extends AbstractSvnCommand implements Modif
         modifications = SvnUtil.createModifications(entries.iterator().next(), revision);
       }
     } catch (SVNException ex) {
-      throw new InternalRepositoryException("could not open repository", ex);
+      throw new InternalRepositoryException(repository, "could not open repository", ex);
     }
     return modifications;
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
index 43b8a38ccc..97d29aaa0f 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
@@ -26,7 +26,7 @@ public class ContextualExceptionMapper<E extends ExceptionWithContext> implement
 
   @Override
   public Response toResponse(E exception) {
-    logger.debug("map {} to status code {}", type.getSimpleName(), status.getStatusCode());
+    logger.debug("map {} to status code {}", type.getSimpleName(), status.getStatusCode(), exception);
     return Response.status(status)
       .entity(mapper.map(exception))
       .type(VndMediaType.ERROR_TYPE)
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java
index faa7f4975c..017568b613 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryRootResource.java
@@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
 import sonia.scm.PageResult;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
-import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.api.RepositoryService;
@@ -24,6 +23,9 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
 
+import static sonia.scm.ContextEntry.ContextBuilder.entity;
+import static sonia.scm.NotFoundException.notFound;
+
 @Slf4j
 public class FileHistoryRootResource {
 
@@ -66,7 +68,8 @@ public class FileHistoryRootResource {
                          @PathParam("path") String path,
                          @DefaultValue("0") @QueryParam("page") int page,
                          @DefaultValue("10") @QueryParam("pageSize") int pageSize) throws IOException {
-    try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
+    NamespaceAndName namespaceAndName = new NamespaceAndName(namespace, name);
+    try (RepositoryService repositoryService = serviceFactory.create(namespaceAndName)) {
       log.info("Get changesets of the file {} and revision {}", path, revision);
       Repository repository = repositoryService.getRepository();
       ChangesetPagingResult changesets = new PagedLogCommandBuilder(repositoryService)
@@ -80,9 +83,9 @@ public class FileHistoryRootResource {
         PageResult<Changeset> pageResult = new PageResult<>(changesets.getChangesets(), changesets.getTotal());
         return Response.ok(fileHistoryCollectionToDtoMapper.map(page, pageSize, pageResult, repository, revision, path)).build();
       } else {
-        String message = String.format("for the revision %s and the file %s there is no changesets", revision, path);
+        String message = String.format("for the revision %s and the file %s there are no changesets", revision, path);
         log.error(message);
-        throw new InternalRepositoryException(message);
+        throw notFound(entity("path", path).in("revision", revision).in(namespaceAndName));
       }
     }
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/InternalRepositoryExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/InternalRepositoryExceptionMapper.java
index d30677c5f7..856a9310a0 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/InternalRepositoryExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/InternalRepositoryExceptionMapper.java
@@ -1,15 +1,17 @@
 package sonia.scm.api.v2.resources;
 
-import sonia.scm.api.rest.StatusExceptionMapper;
+import sonia.scm.api.rest.ContextualExceptionMapper;
 import sonia.scm.repository.InternalRepositoryException;
 
+import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.Provider;
 
 @Provider
-public class InternalRepositoryExceptionMapper extends StatusExceptionMapper<InternalRepositoryException> {
+public class InternalRepositoryExceptionMapper extends ContextualExceptionMapper<InternalRepositoryException> {
 
-  public InternalRepositoryExceptionMapper() {
-    super(InternalRepositoryException.class, Response.Status.INTERNAL_SERVER_ERROR);
+  @Inject
+  public InternalRepositoryExceptionMapper(ExceptionWithContextToErrorDtoMapper mapper) {
+    super(InternalRepositoryException.class, Response.Status.INTERNAL_SERVER_ERROR, mapper);
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
index 6c903815a7..c409a860ec 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
@@ -143,7 +143,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
           try {
             getHandler(newRepository).create(newRepository);
           } catch (AlreadyExistsException e) {
-            throw new InternalRepositoryException("directory for repository does already exist", e);
+            throw new InternalRepositoryException(repository, "directory for repository does already exist", e);
           }
         }
         fireEvent(HandlerEventType.BEFORE_CREATE, newRepository);
@@ -353,9 +353,9 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
     RepositoryHandler handler = handlerMap.get(type);
 
     if (handler == null) {
-      throw new InternalRepositoryException("could not find handler for " + type);
+      throw new InternalRepositoryException(entity(repository), "could not find handler for " + type);
     } else if (!handler.isConfigured()) {
-      throw new InternalRepositoryException("handler is not configured for type " + type);
+      throw new InternalRepositoryException(entity(repository), "handler is not configured for type " + type);
     }
 
     return handler;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
index 4bda5c875d..4b3e21fa60 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
@@ -17,7 +17,7 @@ public class DispatcherMock {
     dispatcher.getProviderFactory().register(new AlreadyExistsExceptionMapper(mapper));
     dispatcher.getProviderFactory().register(new ConcurrentModificationExceptionMapper(mapper));
     dispatcher.getProviderFactory().registerProvider(AuthorizationExceptionMapper.class);
-    dispatcher.getProviderFactory().registerProvider(InternalRepositoryExceptionMapper.class);
+    dispatcher.getProviderFactory().register(new InternalRepositoryExceptionMapper(mapper));
     dispatcher.getProviderFactory().register(new ChangePasswordNotAllowedExceptionMapper(mapper));
     dispatcher.getProviderFactory().register(new InvalidPasswordExceptionMapper(mapper));
     dispatcher.getProviderFactory().registerProvider(IllegalArgumentExceptionMapper.class);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
index 3898ac07e0..52c9a434c0 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
@@ -8,7 +8,6 @@ import org.apache.shiro.util.ThreadContext;
 import org.apache.shiro.util.ThreadState;
 import org.assertj.core.util.Lists;
 import org.jboss.resteasy.core.Dispatcher;
-import org.jboss.resteasy.mock.MockDispatcherFactory;
 import org.jboss.resteasy.mock.MockHttpRequest;
 import org.jboss.resteasy.mock.MockHttpResponse;
 import org.junit.After;
@@ -18,9 +17,8 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import sonia.scm.ContextEntry;
 import sonia.scm.NotFoundException;
-import sonia.scm.api.rest.AuthorizationExceptionMapper;
-import sonia.scm.api.v2.NotFoundExceptionMapper;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.InternalRepositoryException;
@@ -168,7 +166,7 @@ public class FileHistoryResourceTest extends RepositoryTestBase {
     when(logCommandBuilder.setPagingLimit(anyInt())).thenReturn(logCommandBuilder);
     when(logCommandBuilder.setStartChangeset(eq(id))).thenReturn(logCommandBuilder);
     when(logCommandBuilder.setPath(eq(path))).thenReturn(logCommandBuilder);
-    when(logCommandBuilder.getChangesets()).thenThrow(InternalRepositoryException.class);
+    when(logCommandBuilder.getChangesets()).thenThrow(new InternalRepositoryException(ContextEntry.ContextBuilder.noContext(), "", new RuntimeException()));
 
     MockHttpRequest request = MockHttpRequest
       .get(FILE_HISTORY_URL + id + "/" + path)
@@ -179,7 +177,7 @@ public class FileHistoryResourceTest extends RepositoryTestBase {
   }
 
   @Test
-  public void shouldGet500OnNullChangesets() throws Exception {
+  public void shouldGet404OnNullChangesets() throws Exception {
     String id = "revision_123";
     String path = "root_dir/sub_dir/file-to-inspect.txt";
 
@@ -194,6 +192,6 @@ public class FileHistoryResourceTest extends RepositoryTestBase {
       .accept(VndMediaType.CHANGESET_COLLECTION);
     MockHttpResponse response = new MockHttpResponse();
     dispatcher.invoke(request, response);
-    assertEquals(500, response.getStatus());
+    assertEquals(404, response.getStatus());
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
index b3eacf314e..fc4598081d 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
@@ -8,7 +8,6 @@ import org.apache.shiro.util.ThreadContext;
 import org.apache.shiro.util.ThreadState;
 import org.assertj.core.util.Lists;
 import org.jboss.resteasy.core.Dispatcher;
-import org.jboss.resteasy.mock.MockDispatcherFactory;
 import org.jboss.resteasy.mock.MockHttpRequest;
 import org.jboss.resteasy.mock.MockHttpResponse;
 import org.junit.After;
@@ -18,8 +17,6 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import sonia.scm.api.rest.AuthorizationExceptionMapper;
-import sonia.scm.api.v2.NotFoundExceptionMapper;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Modifications;
 import sonia.scm.repository.NamespaceAndName;
@@ -38,6 +35,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static sonia.scm.ContextEntry.ContextBuilder.noContext;
 
 @Slf4j
 @RunWith(MockitoJUnitRunner.Silent.class)
@@ -72,7 +70,7 @@ public class ModificationsResourceTest extends RepositoryTestBase {
 
 
   @Before
-  public void prepareEnvironment() throws Exception {
+  public void prepareEnvironment() {
     modificationsRootResource = new ModificationsRootResource(serviceFactory, modificationsToDtoMapper);
     super.modificationsRootResource = Providers.of(modificationsRootResource);
     dispatcher = DispatcherMock.createDispatcher(getRepositoryRootResource());
@@ -106,7 +104,7 @@ public class ModificationsResourceTest extends RepositoryTestBase {
   @Test
   public void shouldGet500OnModificationsCommandError() throws Exception {
     when(modificationsCommandBuilder.revision(any())).thenReturn(modificationsCommandBuilder);
-    when(modificationsCommandBuilder.getModifications()).thenThrow(InternalRepositoryException.class);
+    when(modificationsCommandBuilder.getModifications()).thenThrow(new InternalRepositoryException(noContext(), "", new RuntimeException()));
 
     MockHttpRequest request = MockHttpRequest
       .get(MODIFICATIONS_URL + "revision")

From 135189839986f98cfb5c4455b681bdc43b2386e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 6 Nov 2018 11:01:33 +0100
Subject: [PATCH 102/188] Fix typo

---
 .../sonia/scm/repository/api/DiffCommandBuilder.java   |  2 +-
 .../scm/api/rest/resources/DiffStreamingOutput.java    |  2 +-
 .../sonia/scm/api/v2/resources/DiffRootResource.java   |  2 +-
 .../sonia/scm/api/v2/resources/DiffResourceTest.java   | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java
index c0e9e3f622..d92cd57f1f 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java
@@ -104,7 +104,7 @@ public final class DiffCommandBuilder
    *
    * @throws IOException
    */
-  public DiffCommandBuilder retriveContent(OutputStream outputStream) throws IOException, RevisionNotFoundException {
+  public DiffCommandBuilder retrieveContent(OutputStream outputStream) throws IOException, RevisionNotFoundException {
     getDiffResult(outputStream);
 
     return this;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java
index db29725917..1e452eeee2 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java
@@ -93,7 +93,7 @@ public class DiffStreamingOutput implements StreamingOutput
   public void write(OutputStream output) throws IOException {
     try
     {
-      builder.retriveContent(output);
+      builder.retrieveContent(output);
     }
     catch (RevisionNotFoundException ex)
     {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
index dbbad2c076..6db23a7fce 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
@@ -66,7 +66,7 @@ public class DiffRootResource {
           repositoryService.getDiffCommand()
             .setRevision(revision)
             .setFormat(diffFormat)
-            .retriveContent(output);
+            .retrieveContent(output);
         } catch (RevisionNotFoundException e) {
           throw new WebApplicationException(Response.Status.NOT_FOUND);
         }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
index 8c508be9fd..d530e0dd4e 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
@@ -92,7 +92,7 @@ public class DiffResourceTest extends RepositoryTestBase {
   public void shouldGetDiffs() throws Exception {
     when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder);
     when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder);
-    when(diffCommandBuilder.retriveContent(any())).thenReturn(diffCommandBuilder);
+    when(diffCommandBuilder.retrieveContent(any())).thenReturn(diffCommandBuilder);
     MockHttpRequest request = MockHttpRequest
       .get(DIFF_URL + "revision")
       .accept(VndMediaType.DIFF);
@@ -124,7 +124,7 @@ public class DiffResourceTest extends RepositoryTestBase {
   public void shouldGet404OnMissingRevision() throws Exception {
     when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder);
     when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder);
-    when(diffCommandBuilder.retriveContent(any())).thenThrow(RevisionNotFoundException.class);
+    when(diffCommandBuilder.retrieveContent(any())).thenThrow(RevisionNotFoundException.class);
 
     MockHttpRequest request = MockHttpRequest
       .get(DIFF_URL + "revision")
@@ -138,7 +138,7 @@ public class DiffResourceTest extends RepositoryTestBase {
   public void shouldGet400OnCrlfInjection() throws Exception {
     when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder);
     when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder);
-    when(diffCommandBuilder.retriveContent(any())).thenThrow(RevisionNotFoundException.class);
+    when(diffCommandBuilder.retrieveContent(any())).thenThrow(RevisionNotFoundException.class);
 
     MockHttpRequest request = MockHttpRequest
       .get(DIFF_URL + "ny%0D%0ASet-cookie:%20Tamper=3079675143472450634")
@@ -152,7 +152,7 @@ public class DiffResourceTest extends RepositoryTestBase {
   public void shouldGet400OnUnknownFormat() throws Exception {
     when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder);
     when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder);
-    when(diffCommandBuilder.retriveContent(any())).thenThrow(RevisionNotFoundException.class);
+    when(diffCommandBuilder.retrieveContent(any())).thenThrow(RevisionNotFoundException.class);
 
     MockHttpRequest request = MockHttpRequest
       .get(DIFF_URL + "revision?format=Unknown")
@@ -166,7 +166,7 @@ public class DiffResourceTest extends RepositoryTestBase {
   public void shouldAcceptDiffFormats() throws Exception {
     when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder);
     when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder);
-    when(diffCommandBuilder.retriveContent(any())).thenReturn(diffCommandBuilder);
+    when(diffCommandBuilder.retrieveContent(any())).thenReturn(diffCommandBuilder);
 
     Arrays.stream(DiffFormat.values()).map(DiffFormat::name).forEach(
       this::assertRequestOk

From 6a674f0ab98972524e7968ea4ef869d16e2ef391 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Tue, 6 Nov 2018 11:24:01 +0100
Subject: [PATCH 103/188] Reset modify state when mounting the respective
 component

Repo, Group, User
---
 scm-ui/src/groups/containers/EditGroup.js | 26 ++++++++++++++++-------
 scm-ui/src/groups/modules/groups.js       |  8 +++++++
 scm-ui/src/repos/containers/Edit.js       | 11 +++++++++-
 scm-ui/src/repos/modules/repos.js         |  9 ++++++++
 scm-ui/src/users/containers/EditUser.js   | 11 +++++++++-
 scm-ui/src/users/modules/users.js         |  8 +++++++
 6 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/scm-ui/src/groups/containers/EditGroup.js b/scm-ui/src/groups/containers/EditGroup.js
index e21731a323..f08f0c2c7a 100644
--- a/scm-ui/src/groups/containers/EditGroup.js
+++ b/scm-ui/src/groups/containers/EditGroup.js
@@ -2,16 +2,22 @@
 import React from "react";
 import { connect } from "react-redux";
 import GroupForm from "../components/GroupForm";
-import { modifyGroup, fetchGroup } from "../modules/groups";
+import {
+  modifyGroup,
+  modifyGroupReset,
+  fetchGroup,
+  isModifyGroupPending,
+  getModifyGroupFailure
+} from "../modules/groups";
 import type { History } from "history";
 import { withRouter } from "react-router-dom";
 import type { Group } from "@scm-manager/ui-types";
-import { isModifyGroupPending, getModifyGroupFailure } from "../modules/groups";
 import { ErrorNotification } from "@scm-manager/ui-components";
 
 type Props = {
   group: Group,
   modifyGroup: (group: Group, callback?: () => void) => void,
+  modifyGroupReset: Group => void,
   fetchGroup: (name: string) => void,
   history: History,
   loading?: boolean,
@@ -19,13 +25,17 @@ type Props = {
 };
 
 class EditGroup extends React.Component<Props> {
-  groupModified = (group: Group) => () => {
-    this.props.fetchGroup(group.name);
-    this.props.history.push(`/group/${group.name}`);
+  componentDidMount() {
+    const { group, modifyGroupReset } = this.props;
+    modifyGroupReset(group);
+  }
+  groupModified = () => () => {
+    const { group, history } = this.props;
+    history.push(`/group/${group.name}`);
   };
 
   modifyGroup = (group: Group) => {
-    this.props.modifyGroup(group, this.groupModified(group));
+    this.props.modifyGroup(group, this.groupModified());
   };
 
   render() {
@@ -59,8 +69,8 @@ const mapDispatchToProps = dispatch => {
     modifyGroup: (group: Group, callback?: () => void) => {
       dispatch(modifyGroup(group, callback));
     },
-    fetchGroup: (name: string) => {
-      dispatch(fetchGroup(name));
+    modifyGroupReset: (group: Group) => {
+      dispatch(modifyGroupReset(group));
     }
   };
 };
diff --git a/scm-ui/src/groups/modules/groups.js b/scm-ui/src/groups/modules/groups.js
index 74e7214052..87e3ef51d5 100644
--- a/scm-ui/src/groups/modules/groups.js
+++ b/scm-ui/src/groups/modules/groups.js
@@ -26,6 +26,7 @@ export const MODIFY_GROUP = "scm/groups/MODIFY_GROUP";
 export const MODIFY_GROUP_PENDING = `${MODIFY_GROUP}_${types.PENDING_SUFFIX}`;
 export const MODIFY_GROUP_SUCCESS = `${MODIFY_GROUP}_${types.SUCCESS_SUFFIX}`;
 export const MODIFY_GROUP_FAILURE = `${MODIFY_GROUP}_${types.FAILURE_SUFFIX}`;
+export const MODIFY_GROUP_RESET = `${MODIFY_GROUP}_${types.RESET_SUFFIX}`;
 
 export const DELETE_GROUP = "scm/groups/DELETE";
 export const DELETE_GROUP_PENDING = `${DELETE_GROUP}_${types.PENDING_SUFFIX}`;
@@ -227,6 +228,13 @@ export function modifyGroupFailure(group: Group, error: Error): Action {
   };
 }
 
+export function modifyGroupReset(group: Group): Action {
+  return {
+    type: MODIFY_GROUP_RESET,
+    itemId: group.name
+  };
+}
+
 //delete group
 
 export function deleteGroup(group: Group, callback?: () => void) {
diff --git a/scm-ui/src/repos/containers/Edit.js b/scm-ui/src/repos/containers/Edit.js
index 1edd9bb150..816dae8de9 100644
--- a/scm-ui/src/repos/containers/Edit.js
+++ b/scm-ui/src/repos/containers/Edit.js
@@ -7,7 +7,8 @@ import type { Repository } from "@scm-manager/ui-types";
 import {
   modifyRepo,
   isModifyRepoPending,
-  getModifyRepoFailure
+  getModifyRepoFailure,
+  modifyRepoReset
 } from "../modules/repos";
 import { withRouter } from "react-router-dom";
 import type { History } from "history";
@@ -16,6 +17,7 @@ import { ErrorNotification } from "@scm-manager/ui-components";
 type Props = {
   repository: Repository,
   modifyRepo: (Repository, () => void) => void,
+  modifyRepoReset: Repository => void,
   loading: boolean,
   error: Error,
 
@@ -25,6 +27,10 @@ type Props = {
 };
 
 class Edit extends React.Component<Props> {
+  componentDidMount() {
+    const { modifyRepoReset, repository } = this.props;
+    modifyRepoReset(repository);
+  }
   repoModified = () => {
     const { history, repository } = this.props;
     history.push(`/repo/${repository.namespace}/${repository.name}`);
@@ -61,6 +67,9 @@ const mapDispatchToProps = dispatch => {
   return {
     modifyRepo: (repo: Repository, callback: () => void) => {
       dispatch(modifyRepo(repo, callback));
+    },
+    modifyRepoReset: (repo: Repository) => {
+      dispatch(modifyRepoReset(repo));
     }
   };
 };
diff --git a/scm-ui/src/repos/modules/repos.js b/scm-ui/src/repos/modules/repos.js
index b5016bbb43..9c7f60ce48 100644
--- a/scm-ui/src/repos/modules/repos.js
+++ b/scm-ui/src/repos/modules/repos.js
@@ -29,6 +29,7 @@ export const MODIFY_REPO = "scm/repos/MODIFY_REPO";
 export const MODIFY_REPO_PENDING = `${MODIFY_REPO}_${types.PENDING_SUFFIX}`;
 export const MODIFY_REPO_SUCCESS = `${MODIFY_REPO}_${types.SUCCESS_SUFFIX}`;
 export const MODIFY_REPO_FAILURE = `${MODIFY_REPO}_${types.FAILURE_SUFFIX}`;
+export const MODIFY_REPO_RESET = `${MODIFY_REPO}_${types.RESET_SUFFIX}`;
 
 export const DELETE_REPO = "scm/repos/DELETE_REPO";
 export const DELETE_REPO_PENDING = `${DELETE_REPO}_${types.PENDING_SUFFIX}`;
@@ -247,6 +248,14 @@ export function modifyRepoFailure(
   };
 }
 
+export function modifyRepoReset(repository: Repository): Action {
+  return {
+    type: MODIFY_REPO_RESET,
+    payload: { repository },
+    itemId: createIdentifier(repository)
+  };
+}
+
 // delete
 
 export function deleteRepo(repository: Repository, callback?: () => void) {
diff --git a/scm-ui/src/users/containers/EditUser.js b/scm-ui/src/users/containers/EditUser.js
index b99601f3ca..55062ecb5b 100644
--- a/scm-ui/src/users/containers/EditUser.js
+++ b/scm-ui/src/users/containers/EditUser.js
@@ -7,7 +7,8 @@ import type { User } from "@scm-manager/ui-types";
 import {
   modifyUser,
   isModifyUserPending,
-  getModifyUserFailure
+  getModifyUserFailure,
+  modifyUserReset
 } from "../modules/users";
 import type { History } from "history";
 import { ErrorNotification } from "@scm-manager/ui-components";
@@ -18,6 +19,7 @@ type Props = {
 
   // dispatch functions
   modifyUser: (user: User, callback?: () => void) => void,
+  modifyUserReset: User => void,
 
   // context objects
   user: User,
@@ -25,6 +27,10 @@ type Props = {
 };
 
 class EditUser extends React.Component<Props> {
+  componentDidMount() {
+    const { modifyUserReset, user } = this.props;
+    modifyUserReset(user);
+  }
   userModified = (user: User) => () => {
     this.props.history.push(`/user/${user.name}`);
   };
@@ -52,6 +58,9 @@ const mapDispatchToProps = dispatch => {
   return {
     modifyUser: (user: User, callback?: () => void) => {
       dispatch(modifyUser(user, callback));
+    },
+    modifyUserReset: (user: User) => {
+      dispatch(modifyUserReset(user));
     }
   };
 };
diff --git a/scm-ui/src/users/modules/users.js b/scm-ui/src/users/modules/users.js
index 80d8107b3e..ae8c846fe4 100644
--- a/scm-ui/src/users/modules/users.js
+++ b/scm-ui/src/users/modules/users.js
@@ -26,6 +26,7 @@ export const MODIFY_USER = "scm/users/MODIFY_USER";
 export const MODIFY_USER_PENDING = `${MODIFY_USER}_${types.PENDING_SUFFIX}`;
 export const MODIFY_USER_SUCCESS = `${MODIFY_USER}_${types.SUCCESS_SUFFIX}`;
 export const MODIFY_USER_FAILURE = `${MODIFY_USER}_${types.FAILURE_SUFFIX}`;
+export const MODIFY_USER_RESET = `${MODIFY_USER}_${types.RESET_SUFFIX}`;
 
 export const DELETE_USER = "scm/users/DELETE";
 export const DELETE_USER_PENDING = `${DELETE_USER}_${types.PENDING_SUFFIX}`;
@@ -228,6 +229,13 @@ export function modifyUserFailure(user: User, error: Error): Action {
   };
 }
 
+export function modifyUserReset(user: User): Action {
+  return {
+    type: MODIFY_USER_RESET,
+    itemId: user.name
+  };
+}
+
 //delete user
 
 export function deleteUser(user: User, callback?: () => void) {

From a725e4232b3648dbd6405de801ebcdc9171d3d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 6 Nov 2018 11:26:36 +0100
Subject: [PATCH 104/188] Add unit test for git diff command

---
 .../repository/spi/GitDiffCommandTest.java    | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java

diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java
new file mode 100644
index 0000000000..3b12fb0c3f
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java
@@ -0,0 +1,45 @@
+package sonia.scm.repository.spi;
+
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+
+import static org.junit.Assert.assertEquals;
+
+public class GitDiffCommandTest extends AbstractGitCommandTestBase {
+
+  private static final String DIFF_LATEST_COMMIT_TEST_BRANCH = "diff --git a/a.txt b/a.txt\n" +
+    "index 7898192..1dc60c7 100644\n" +
+    "--- a/a.txt\n" +
+    "+++ b/a.txt\n" +
+    "@@ -1 +1 @@\n" +
+    "-a\n" +
+    "+a and b\n" +
+    "diff --git a/b.txt b/b.txt\n" +
+    "deleted file mode 100644\n" +
+    "index 6178079..0000000\n" +
+    "--- a/b.txt\n" +
+    "+++ /dev/null\n" +
+    "@@ -1 +0,0 @@\n" +
+    "-b\n";
+
+  @Test
+  public void diffForOneRevisionShouldCreateDiff() {
+    GitDiffCommand gitDiffCommand = new GitDiffCommand(createContext(), repository);
+    DiffCommandRequest diffCommandRequest = new DiffCommandRequest();
+    diffCommandRequest.setRevision("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4");
+    ByteArrayOutputStream output = new ByteArrayOutputStream();
+    gitDiffCommand.getDiffResult(diffCommandRequest, output);
+    assertEquals(DIFF_LATEST_COMMIT_TEST_BRANCH, output.toString());
+  }
+
+  @Test
+  public void diffForOneBranchShouldCreateDiff() {
+    GitDiffCommand gitDiffCommand = new GitDiffCommand(createContext(), repository);
+    DiffCommandRequest diffCommandRequest = new DiffCommandRequest();
+    diffCommandRequest.setRevision("test-branch");
+    ByteArrayOutputStream output = new ByteArrayOutputStream();
+    gitDiffCommand.getDiffResult(diffCommandRequest, output);
+    assertEquals(DIFF_LATEST_COMMIT_TEST_BRANCH, output.toString());
+  }
+}

From 8be8c19a266622e9b3486a18ca6b6c952b970f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 6 Nov 2018 12:04:33 +0100
Subject: [PATCH 105/188] Implement diff between two changesets for git

---
 .../repository/spi/DiffCommandRequest.java    | 12 +++++++--
 .../java/sonia/scm/repository/GitUtil.java    | 13 +++++++++
 .../scm/repository/spi/GitDiffCommand.java    | 27 +++++++++++++------
 .../repository/spi/GitDiffCommandTest.java    | 24 +++++++++++++++++
 4 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/DiffCommandRequest.java b/scm-core/src/main/java/sonia/scm/repository/spi/DiffCommandRequest.java
index 5cfd57f71b..e26b2eb5aa 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/DiffCommandRequest.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/DiffCommandRequest.java
@@ -109,7 +109,10 @@ public final class DiffCommandRequest extends FileBaseCommandRequest
     this.format = format;
   }
 
-  //~--- get methods ----------------------------------------------------------
+  public void setAncestorChangeset(String ancestorChangeset) {
+    this.ancestorChangeset = ancestorChangeset;
+  }
+//~--- get methods ----------------------------------------------------------
 
   /**
    * Return the output format of the diff command.
@@ -124,8 +127,13 @@ public final class DiffCommandRequest extends FileBaseCommandRequest
     return format;
   }
 
-  //~--- fields ---------------------------------------------------------------
+  public String getAncestorChangeset() {
+    return ancestorChangeset;
+  }
+//~--- fields ---------------------------------------------------------------
 
   /** diff format */
   private DiffFormat format = DiffFormat.NATIVE;
+
+  private String ancestorChangeset;
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
index 13340a20e7..6d7be2e93c 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
@@ -48,6 +48,7 @@ import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.revwalk.filter.RevFilter;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.transport.FetchResult;
 import org.eclipse.jgit.transport.RefSpec;
@@ -716,6 +717,18 @@ public final class GitUtil
     return (id != null) &&!id.equals(ObjectId.zeroId());
   }
 
+  /**
+   * Computes the first common ancestor of two revisions, aka merge base.
+   */
+  public static ObjectId computeCommonAncestor(org.eclipse.jgit.lib.Repository repository, ObjectId revision1, ObjectId revision2) throws IOException {
+    try (RevWalk mergeBaseWalk = new RevWalk(repository)) {
+      mergeBaseWalk.setRevFilter(RevFilter.MERGE_BASE);
+      mergeBaseWalk.markStart(mergeBaseWalk.lookupCommit(revision1));
+      mergeBaseWalk.markStart(mergeBaseWalk.parseCommit(revision2));
+      return mergeBaseWalk.next().getId();
+    }
+  }
+
   //~--- methods --------------------------------------------------------------
 
   /**
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffCommand.java
index 83977ef290..2d56c8e786 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffCommand.java
@@ -34,27 +34,25 @@ package sonia.scm.repository.spi;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.base.Strings;
 import org.eclipse.jgit.diff.DiffEntry;
 import org.eclipse.jgit.diff.DiffFormatter;
+import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevTree;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.treewalk.EmptyTreeIterator;
 import org.eclipse.jgit.treewalk.TreeWalk;
 import org.eclipse.jgit.treewalk.filter.PathFilter;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sonia.scm.repository.GitUtil;
 import sonia.scm.repository.Repository;
 import sonia.scm.util.Util;
 
-//~--- JDK imports ------------------------------------------------------------
-
 import java.io.BufferedOutputStream;
+import java.io.IOException;
 import java.io.OutputStream;
-
 import java.util.List;
 
 /**
@@ -107,7 +105,8 @@ public class GitDiffCommand extends AbstractGitCommand implements DiffCommand
 
       walk = new RevWalk(gr);
 
-      RevCommit commit = walk.parseCommit(gr.resolve(request.getRevision()));
+      ObjectId revision = gr.resolve(request.getRevision());
+      RevCommit commit = walk.parseCommit(revision);
 
       walk.markStart(commit);
       commit = walk.next();
@@ -120,7 +119,15 @@ public class GitDiffCommand extends AbstractGitCommand implements DiffCommand
         treeWalk.setFilter(PathFilter.create(request.getPath()));
       }
 
-      if (commit.getParentCount() > 0)
+
+      if (!Strings.isNullOrEmpty(request.getAncestorChangeset()))
+      {
+        ObjectId otherRevision = gr.resolve(request.getAncestorChangeset());
+        ObjectId ancestorId = computeCommonAncestor(gr, revision, otherRevision);
+        RevTree tree = walk.parseCommit(ancestorId).getTree();
+        treeWalk.addTree(tree);
+      }
+      else if (commit.getParentCount() > 0)
       {
         RevTree tree = commit.getParent(0).getTree();
 
@@ -156,7 +163,6 @@ public class GitDiffCommand extends AbstractGitCommand implements DiffCommand
     }
     catch (Exception ex)
     {
-
       // TODO throw exception
       logger.error("could not create diff", ex);
     }
@@ -167,4 +173,9 @@ public class GitDiffCommand extends AbstractGitCommand implements DiffCommand
       GitUtil.release(formatter);
     }
   }
+
+  private ObjectId computeCommonAncestor(org.eclipse.jgit.lib.Repository repository, ObjectId revision1, ObjectId revision2) throws IOException {
+    return GitUtil.computeCommonAncestor(repository, revision1, revision2);
+  }
+
 }
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java
index 3b12fb0c3f..d07801ceab 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java
@@ -42,4 +42,28 @@ public class GitDiffCommandTest extends AbstractGitCommandTestBase {
     gitDiffCommand.getDiffResult(diffCommandRequest, output);
     assertEquals(DIFF_LATEST_COMMIT_TEST_BRANCH, output.toString());
   }
+
+  @Test
+  public void diffBetweenTwoBranchesShouldCreateDiff() {
+    GitDiffCommand gitDiffCommand = new GitDiffCommand(createContext(), repository);
+    DiffCommandRequest diffCommandRequest = new DiffCommandRequest();
+    diffCommandRequest.setRevision("master");
+    diffCommandRequest.setAncestorChangeset("test-branch");
+    ByteArrayOutputStream output = new ByteArrayOutputStream();
+    gitDiffCommand.getDiffResult(diffCommandRequest, output);
+    assertEquals("diff --git a/a.txt b/a.txt\n" +
+      "index 7898192..2f8bc28 100644\n" +
+      "--- a/a.txt\n" +
+      "+++ b/a.txt\n" +
+      "@@ -1 +1,2 @@\n" +
+      " a\n" +
+      "+line for blame\n" +
+      "diff --git a/f.txt b/f.txt\n" +
+      "new file mode 100644\n" +
+      "index 0000000..6a69f92\n" +
+      "--- /dev/null\n" +
+      "+++ b/f.txt\n" +
+      "@@ -0,0 +1 @@\n" +
+      "+f\n", output.toString());
+  }
 }

From adce24fcd77c7b409553e3b2716559ea9afcac64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 6 Nov 2018 12:36:36 +0100
Subject: [PATCH 106/188] Enhance unit test

---
 .../repository/spi/GitDiffCommandTest.java    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java
index d07801ceab..84088ba4ef 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java
@@ -43,6 +43,23 @@ public class GitDiffCommandTest extends AbstractGitCommandTestBase {
     assertEquals(DIFF_LATEST_COMMIT_TEST_BRANCH, output.toString());
   }
 
+  @Test
+  public void diffForPathShouldCreateLimitedDiff() {
+    GitDiffCommand gitDiffCommand = new GitDiffCommand(createContext(), repository);
+    DiffCommandRequest diffCommandRequest = new DiffCommandRequest();
+    diffCommandRequest.setRevision("test-branch");
+    diffCommandRequest.setPath("a.txt");
+    ByteArrayOutputStream output = new ByteArrayOutputStream();
+    gitDiffCommand.getDiffResult(diffCommandRequest, output);
+    assertEquals("diff --git a/a.txt b/a.txt\n" +
+      "index 7898192..1dc60c7 100644\n" +
+      "--- a/a.txt\n" +
+      "+++ b/a.txt\n" +
+      "@@ -1 +1 @@\n" +
+      "-a\n" +
+      "+a and b\n", output.toString());
+  }
+
   @Test
   public void diffBetweenTwoBranchesShouldCreateDiff() {
     GitDiffCommand gitDiffCommand = new GitDiffCommand(createContext(), repository);
@@ -66,4 +83,22 @@ public class GitDiffCommandTest extends AbstractGitCommandTestBase {
       "@@ -0,0 +1 @@\n" +
       "+f\n", output.toString());
   }
+
+  @Test
+  public void diffBetweenTwoBranchesForPathShouldCreateLimitedDiff() {
+    GitDiffCommand gitDiffCommand = new GitDiffCommand(createContext(), repository);
+    DiffCommandRequest diffCommandRequest = new DiffCommandRequest();
+    diffCommandRequest.setRevision("master");
+    diffCommandRequest.setAncestorChangeset("test-branch");
+    diffCommandRequest.setPath("a.txt");
+    ByteArrayOutputStream output = new ByteArrayOutputStream();
+    gitDiffCommand.getDiffResult(diffCommandRequest, output);
+    assertEquals("diff --git a/a.txt b/a.txt\n" +
+      "index 7898192..2f8bc28 100644\n" +
+      "--- a/a.txt\n" +
+      "+++ b/a.txt\n" +
+      "@@ -1 +1,2 @@\n" +
+      " a\n" +
+      "+line for blame\n", output.toString());
+  }
 }

From cccadef5cc7258f59f962bad49d6b33c2ebdba05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 6 Nov 2018 12:40:44 +0100
Subject: [PATCH 107/188] Refactor unit test

---
 .../repository/spi/GitDiffCommandTest.java    | 55 ++++++++-----------
 1 file changed, 22 insertions(+), 33 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java
index 84088ba4ef..f6e462f968 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java
@@ -8,20 +8,34 @@ import static org.junit.Assert.assertEquals;
 
 public class GitDiffCommandTest extends AbstractGitCommandTestBase {
 
-  private static final String DIFF_LATEST_COMMIT_TEST_BRANCH = "diff --git a/a.txt b/a.txt\n" +
+  public static final String DIFF_FILE_A = "diff --git a/a.txt b/a.txt\n" +
     "index 7898192..1dc60c7 100644\n" +
     "--- a/a.txt\n" +
     "+++ b/a.txt\n" +
     "@@ -1 +1 @@\n" +
     "-a\n" +
-    "+a and b\n" +
-    "diff --git a/b.txt b/b.txt\n" +
+    "+a and b\n";
+  public static final String DIFF_FILE_B = "diff --git a/b.txt b/b.txt\n" +
     "deleted file mode 100644\n" +
     "index 6178079..0000000\n" +
     "--- a/b.txt\n" +
     "+++ /dev/null\n" +
     "@@ -1 +0,0 @@\n" +
     "-b\n";
+  public static final String DIFF_FILE_A_MULTIPLE_REVISIONS = "diff --git a/a.txt b/a.txt\n" +
+    "index 7898192..2f8bc28 100644\n" +
+    "--- a/a.txt\n" +
+    "+++ b/a.txt\n" +
+    "@@ -1 +1,2 @@\n" +
+    " a\n" +
+    "+line for blame\n";
+  public static final String DIFF_FILE_F_MULTIPLE_REVISIONS = "diff --git a/f.txt b/f.txt\n" +
+    "new file mode 100644\n" +
+    "index 0000000..6a69f92\n" +
+    "--- /dev/null\n" +
+    "+++ b/f.txt\n" +
+    "@@ -0,0 +1 @@\n" +
+    "+f\n";
 
   @Test
   public void diffForOneRevisionShouldCreateDiff() {
@@ -30,7 +44,7 @@ public class GitDiffCommandTest extends AbstractGitCommandTestBase {
     diffCommandRequest.setRevision("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4");
     ByteArrayOutputStream output = new ByteArrayOutputStream();
     gitDiffCommand.getDiffResult(diffCommandRequest, output);
-    assertEquals(DIFF_LATEST_COMMIT_TEST_BRANCH, output.toString());
+    assertEquals(DIFF_FILE_A + DIFF_FILE_B, output.toString());
   }
 
   @Test
@@ -40,7 +54,7 @@ public class GitDiffCommandTest extends AbstractGitCommandTestBase {
     diffCommandRequest.setRevision("test-branch");
     ByteArrayOutputStream output = new ByteArrayOutputStream();
     gitDiffCommand.getDiffResult(diffCommandRequest, output);
-    assertEquals(DIFF_LATEST_COMMIT_TEST_BRANCH, output.toString());
+    assertEquals(DIFF_FILE_A + DIFF_FILE_B, output.toString());
   }
 
   @Test
@@ -51,13 +65,7 @@ public class GitDiffCommandTest extends AbstractGitCommandTestBase {
     diffCommandRequest.setPath("a.txt");
     ByteArrayOutputStream output = new ByteArrayOutputStream();
     gitDiffCommand.getDiffResult(diffCommandRequest, output);
-    assertEquals("diff --git a/a.txt b/a.txt\n" +
-      "index 7898192..1dc60c7 100644\n" +
-      "--- a/a.txt\n" +
-      "+++ b/a.txt\n" +
-      "@@ -1 +1 @@\n" +
-      "-a\n" +
-      "+a and b\n", output.toString());
+    assertEquals(DIFF_FILE_A, output.toString());
   }
 
   @Test
@@ -68,20 +76,7 @@ public class GitDiffCommandTest extends AbstractGitCommandTestBase {
     diffCommandRequest.setAncestorChangeset("test-branch");
     ByteArrayOutputStream output = new ByteArrayOutputStream();
     gitDiffCommand.getDiffResult(diffCommandRequest, output);
-    assertEquals("diff --git a/a.txt b/a.txt\n" +
-      "index 7898192..2f8bc28 100644\n" +
-      "--- a/a.txt\n" +
-      "+++ b/a.txt\n" +
-      "@@ -1 +1,2 @@\n" +
-      " a\n" +
-      "+line for blame\n" +
-      "diff --git a/f.txt b/f.txt\n" +
-      "new file mode 100644\n" +
-      "index 0000000..6a69f92\n" +
-      "--- /dev/null\n" +
-      "+++ b/f.txt\n" +
-      "@@ -0,0 +1 @@\n" +
-      "+f\n", output.toString());
+    assertEquals(DIFF_FILE_A_MULTIPLE_REVISIONS + DIFF_FILE_F_MULTIPLE_REVISIONS, output.toString());
   }
 
   @Test
@@ -93,12 +88,6 @@ public class GitDiffCommandTest extends AbstractGitCommandTestBase {
     diffCommandRequest.setPath("a.txt");
     ByteArrayOutputStream output = new ByteArrayOutputStream();
     gitDiffCommand.getDiffResult(diffCommandRequest, output);
-    assertEquals("diff --git a/a.txt b/a.txt\n" +
-      "index 7898192..2f8bc28 100644\n" +
-      "--- a/a.txt\n" +
-      "+++ b/a.txt\n" +
-      "@@ -1 +1,2 @@\n" +
-      " a\n" +
-      "+line for blame\n", output.toString());
+    assertEquals(DIFF_FILE_A_MULTIPLE_REVISIONS, output.toString());
   }
 }

From d00c487f362cf3656ab2f5d0436b88c2abe73c88 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Tue, 6 Nov 2018 13:14:02 +0100
Subject: [PATCH 108/188] Extracted commonly used URL in tests to constant

---
 scm-ui/src/users/modules/users.test.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/scm-ui/src/users/modules/users.test.js b/scm-ui/src/users/modules/users.test.js
index dd3abdf47a..ac4d1c97a9 100644
--- a/scm-ui/src/users/modules/users.test.js
+++ b/scm-ui/src/users/modules/users.test.js
@@ -124,6 +124,7 @@ const response = {
 
 const URL = "users";
 const USERS_URL = "/api/v2/users";
+const USER_ZAPHOD_URL = "http://localhost:8081/api/v2/users/zaphod";
 
 const error = new Error("KAPUTT");
 
@@ -193,7 +194,7 @@ describe("users fetch()", () => {
   });
 
   it("should sucessfully fetch single user", () => {
-    fetchMock.getOnce("http://localhost:8081/api/v2/users/zaphod", userZaphod);
+    fetchMock.getOnce(USER_ZAPHOD_URL, userZaphod);
 
     const store = mockStore({});
     return store.dispatch(fetchUserByLink(userZaphod)).then(() => {
@@ -205,7 +206,7 @@ describe("users fetch()", () => {
   });
 
   it("should fail fetching single user on HTTP 500", () => {
-    fetchMock.getOnce("http://localhost:8081/api/v2/users/zaphod", {
+    fetchMock.getOnce(USER_ZAPHOD_URL, {
       status: 500
     });
 
@@ -268,10 +269,10 @@ describe("users fetch()", () => {
   });
 
   it("successfully update user", () => {
-    fetchMock.putOnce("http://localhost:8081/api/v2/users/zaphod", {
+    fetchMock.putOnce(USER_ZAPHOD_URL, {
       status: 204
     });
-    fetchMock.getOnce("http://localhost:8081/api/v2/users/zaphod", userZaphod);
+    fetchMock.getOnce(USER_ZAPHOD_URL, userZaphod);
 
     const store = mockStore({});
     return store.dispatch(modifyUser(userZaphod)).then(() => {
@@ -284,10 +285,10 @@ describe("users fetch()", () => {
   });
 
   it("should call callback, after successful modified user", () => {
-    fetchMock.putOnce("http://localhost:8081/api/v2/users/zaphod", {
+    fetchMock.putOnce(USER_ZAPHOD_URL, {
       status: 204
     });
-    fetchMock.getOnce("http://localhost:8081/api/v2/users/zaphod", userZaphod);
+    fetchMock.getOnce(USER_ZAPHOD_URL, userZaphod);
 
     let called = false;
     const callMe = () => {

From 3d604fc833df56c0b6de4504c61694e90b1e66bd Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Tue, 6 Nov 2018 13:19:56 +0100
Subject: [PATCH 109/188] Extracted commonly used URL in groups.test.js to
 constant

---
 scm-ui/src/groups/modules/groups.test.js | 36 +++++++++---------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/scm-ui/src/groups/modules/groups.test.js b/scm-ui/src/groups/modules/groups.test.js
index 970e96ba70..57d41975a1 100644
--- a/scm-ui/src/groups/modules/groups.test.js
+++ b/scm-ui/src/groups/modules/groups.test.js
@@ -47,6 +47,7 @@ import reducer, {
   getCreateGroupLink
 } from "./groups";
 const GROUPS_URL = "/api/v2/groups";
+const URL_HUMAN_GROUP = "http://localhost:8081/api/v2/groups/humanGroup";
 const URL = "/groups";
 
 const error = new Error("You have an error!");
@@ -60,13 +61,13 @@ const humanGroup = {
   members: ["userZaphod"],
   _links: {
     self: {
-      href: "http://localhost:8081/api/v2/groups/humanGroup"
+      href: URL_HUMAN_GROUP
     },
     delete: {
-      href: "http://localhost:8081/api/v2/groups/humanGroup"
+      href: URL_HUMAN_GROUP
     },
     update: {
-      href: "http://localhost:8081/api/v2/groups/humanGroup"
+      href: URL_HUMAN_GROUP
     }
   },
   _embedded: {
@@ -199,10 +200,7 @@ describe("groups fetch()", () => {
   });
 
   it("should sucessfully fetch single group", () => {
-    fetchMock.getOnce(
-      "http://localhost:8081/api/v2/groups/humanGroup",
-      humanGroup
-    );
+    fetchMock.getOnce(URL_HUMAN_GROUP, humanGroup);
 
     const store = mockStore({});
     return store.dispatch(fetchGroupByLink(humanGroup)).then(() => {
@@ -214,7 +212,7 @@ describe("groups fetch()", () => {
   });
 
   it("should fail fetching single group on HTTP 500", () => {
-    fetchMock.getOnce("http://localhost:8081/api/v2/groups/humanGroup", {
+    fetchMock.getOnce(URL_HUMAN_GROUP, {
       status: 500
     });
 
@@ -274,13 +272,10 @@ describe("groups fetch()", () => {
   });
 
   it("should successfully modify group", () => {
-    fetchMock.putOnce("http://localhost:8081/api/v2/groups/humanGroup", {
+    fetchMock.putOnce(URL_HUMAN_GROUP, {
       status: 204
     });
-    fetchMock.getOnce(
-      "http://localhost:8081/api/v2/groups/humanGroup",
-      humanGroup
-    );
+    fetchMock.getOnce(URL_HUMAN_GROUP, humanGroup);
 
     const store = mockStore({});
 
@@ -294,13 +289,10 @@ describe("groups fetch()", () => {
   });
 
   it("should call the callback after modifying group", () => {
-    fetchMock.putOnce("http://localhost:8081/api/v2/groups/humanGroup", {
+    fetchMock.putOnce(URL_HUMAN_GROUP, {
       status: 204
     });
-    fetchMock.getOnce(
-      "http://localhost:8081/api/v2/groups/humanGroup",
-      humanGroup
-    );
+    fetchMock.getOnce(URL_HUMAN_GROUP, humanGroup);
 
     let called = false;
     const callback = () => {
@@ -318,7 +310,7 @@ describe("groups fetch()", () => {
   });
 
   it("should fail modifying group on HTTP 500", () => {
-    fetchMock.putOnce("http://localhost:8081/api/v2/groups/humanGroup", {
+    fetchMock.putOnce(URL_HUMAN_GROUP, {
       status: 500
     });
 
@@ -333,7 +325,7 @@ describe("groups fetch()", () => {
   });
 
   it("should delete successfully group humanGroup", () => {
-    fetchMock.deleteOnce("http://localhost:8081/api/v2/groups/humanGroup", {
+    fetchMock.deleteOnce(URL_HUMAN_GROUP, {
       status: 204
     });
 
@@ -348,7 +340,7 @@ describe("groups fetch()", () => {
   });
 
   it("should call the callback, after successful delete", () => {
-    fetchMock.deleteOnce("http://localhost:8081/api/v2/groups/humanGroup", {
+    fetchMock.deleteOnce(URL_HUMAN_GROUP, {
       status: 204
     });
 
@@ -364,7 +356,7 @@ describe("groups fetch()", () => {
   });
 
   it("should fail to delete group humanGroup", () => {
-    fetchMock.deleteOnce("http://localhost:8081/api/v2/groups/humanGroup", {
+    fetchMock.deleteOnce(URL_HUMAN_GROUP, {
       status: 500
     });
 

From 89215f43b2c0157826c4707ab55269c4d613ae6a Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Tue, 6 Nov 2018 13:06:35 +0000
Subject: [PATCH 110/188] Close branch feature/HandleLastModifiedAtUpdate


From 1854cfcfba350ef1bf11813f85cca89c96ea4b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 6 Nov 2018 14:10:51 +0100
Subject: [PATCH 111/188] Add command api for merge

---
 .../sonia/scm/repository/api/Command.java     |  6 +-
 .../repository/api/MergeCommandBuilder.java   | 35 ++++++++++
 .../scm/repository/spi/MergeCommand.java      |  5 ++
 .../repository/spi/MergeCommandRequest.java   | 70 +++++++++++++++++++
 .../spi/RepositoryServiceProvider.java        |  8 +++
 5 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
 create mode 100644 scm-core/src/main/java/sonia/scm/repository/spi/MergeCommand.java
 create mode 100644 scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/Command.java b/scm-core/src/main/java/sonia/scm/repository/api/Command.java
index 2f844cfbfb..fa09cea2cb 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/Command.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/Command.java
@@ -66,6 +66,10 @@ public enum Command
   /**
    * @since 2.0
    */
-  MODIFICATIONS
+  MODIFICATIONS,
 
+  /**
+   * @since 2.0
+   */
+  MERGE
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
new file mode 100644
index 0000000000..6d9b332f0a
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
@@ -0,0 +1,35 @@
+package sonia.scm.repository.api;
+
+import com.google.common.base.Preconditions;
+import sonia.scm.repository.spi.MergeCommand;
+import sonia.scm.repository.spi.MergeCommandRequest;
+
+public class MergeCommandBuilder {
+
+  private final MergeCommand mergeCommand;
+  private final MergeCommandRequest request = new MergeCommandRequest();
+
+  public MergeCommandBuilder(MergeCommand mergeCommand) {
+    this.mergeCommand = mergeCommand;
+  }
+
+  public MergeCommandBuilder setBranchToMerge(String branchToMerge) {
+    request.setBranchToMerge(branchToMerge);
+    return this;
+  }
+
+  public MergeCommandBuilder setTargetBranch(String targetBranch) {
+    request.setTargetBranch(targetBranch);
+    return this;
+  }
+
+  public MergeCommandBuilder reset() {
+    request.reset();
+    return this;
+  }
+
+  public boolean execute() {
+    Preconditions.checkArgument(request.isValid(), "revision to merge and target revision is required");
+    return mergeCommand.merge(request);
+  }
+}
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommand.java b/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommand.java
new file mode 100644
index 0000000000..326bba4dce
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommand.java
@@ -0,0 +1,5 @@
+package sonia.scm.repository.spi;
+
+public interface MergeCommand {
+  boolean merge(MergeCommandRequest request);
+}
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java b/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java
new file mode 100644
index 0000000000..e01e580afa
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java
@@ -0,0 +1,70 @@
+package sonia.scm.repository.spi;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
+import com.google.common.base.Strings;
+import sonia.scm.Validateable;
+
+import java.io.Serializable;
+
+public class MergeCommandRequest implements Validateable, Resetable, Serializable, Cloneable {
+
+  private static final long serialVersionUID = -2650236557922431528L;
+
+  private String branchToMerge;
+  private String targetBranch;
+
+  public String getBranchToMerge() {
+    return branchToMerge;
+  }
+
+  public void setBranchToMerge(String branchToMerge) {
+    this.branchToMerge = branchToMerge;
+  }
+
+  public String getTargetBranch() {
+    return targetBranch;
+  }
+
+  public void setTargetBranch(String targetBranch) {
+    this.targetBranch = targetBranch;
+  }
+
+  public boolean isValid() {
+    return !Strings.isNullOrEmpty(getBranchToMerge()) && !Strings.isNullOrEmpty(getTargetBranch());
+  }
+
+  public void reset() {
+    this.setBranchToMerge(null);
+    this.setTargetBranch(null);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (obj == null) {
+      return false;
+    }
+
+    if (getClass() != obj.getClass()) {
+      return false;
+    }
+
+    final MergeCommandRequest other = (MergeCommandRequest) obj;
+
+    return Objects.equal(branchToMerge, other.branchToMerge)
+      && Objects.equal(targetBranch, other.targetBranch);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(branchToMerge, targetBranch);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+      .add("branchToMerge", branchToMerge)
+      .add("targetBranch", targetBranch)
+      .toString();
+  }
+}
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java b/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
index c66c56c0f1..77201d1a72 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
@@ -251,4 +251,12 @@ public abstract class RepositoryServiceProvider implements Closeable
   {
     throw new CommandNotSupportedException(Command.UNBUNDLE);
   }
+
+  /**
+   * @since 2.0
+   */
+  public MergeCommand getMergeCommand()
+  {
+    throw new CommandNotSupportedException(Command.MERGE);
+  }
 }

From 8df0b53f364175775893f528f612eb86b585c9b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 6 Nov 2018 14:27:08 +0100
Subject: [PATCH 112/188] Add command api for dry run merge

---
 .../sonia/scm/repository/api/Command.java     |  7 +-
 .../api/MergeDryRunCommandBuilder.java        | 35 ++++++++++
 .../repository/spi/MergeDryRunCommand.java    |  5 ++
 .../spi/MergeDryRunCommandRequest.java        | 70 +++++++++++++++++++
 .../spi/RepositoryServiceProvider.java        |  8 +++
 5 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandBuilder.java
 create mode 100644 scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommand.java
 create mode 100644 scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommandRequest.java

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/Command.java b/scm-core/src/main/java/sonia/scm/repository/api/Command.java
index fa09cea2cb..2987232ff2 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/Command.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/Command.java
@@ -71,5 +71,10 @@ public enum Command
   /**
    * @since 2.0
    */
-  MERGE
+  MERGE,
+
+  /**
+   * @since 2.0
+   */
+  MERGE_DRY_RUN
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandBuilder.java
new file mode 100644
index 0000000000..852ffdcfbd
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandBuilder.java
@@ -0,0 +1,35 @@
+package sonia.scm.repository.api;
+
+import com.google.common.base.Preconditions;
+import sonia.scm.repository.spi.MergeCommand;
+import sonia.scm.repository.spi.MergeCommandRequest;
+
+public class MergeDryRunCommandBuilder {
+
+  private final MergeCommand mergeCommand;
+  private final MergeCommandRequest request = new MergeCommandRequest();
+
+  public MergeDryRunCommandBuilder(MergeCommand mergeCommand) {
+    this.mergeCommand = mergeCommand;
+  }
+
+  public MergeDryRunCommandBuilder setBranchToMerge(String branchToMerge) {
+    request.setBranchToMerge(branchToMerge);
+    return this;
+  }
+
+  public MergeDryRunCommandBuilder setTargetBranch(String targetBranch) {
+    request.setTargetBranch(targetBranch);
+    return this;
+  }
+
+  public MergeDryRunCommandBuilder reset() {
+    request.reset();
+    return this;
+  }
+
+  public boolean execute() {
+    Preconditions.checkArgument(request.isValid(), "revision to merge and target revision is required");
+    return mergeCommand.merge(request);
+  }
+}
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommand.java b/scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommand.java
new file mode 100644
index 0000000000..af4fbe06bd
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommand.java
@@ -0,0 +1,5 @@
+package sonia.scm.repository.spi;
+
+public interface MergeDryRunCommand {
+  boolean isMergeable(MergeDryRunCommandRequest request);
+}
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommandRequest.java b/scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommandRequest.java
new file mode 100644
index 0000000000..b0cd737bd1
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommandRequest.java
@@ -0,0 +1,70 @@
+package sonia.scm.repository.spi;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
+import com.google.common.base.Strings;
+import sonia.scm.Validateable;
+
+import java.io.Serializable;
+
+public class MergeDryRunCommandRequest implements Validateable, Resetable, Serializable, Cloneable {
+
+  private static final long serialVersionUID = -2650236557922431528L;
+
+  private String branchToMerge;
+  private String targetBranch;
+
+  public String getBranchToMerge() {
+    return branchToMerge;
+  }
+
+  public void setBranchToMerge(String branchToMerge) {
+    this.branchToMerge = branchToMerge;
+  }
+
+  public String getTargetBranch() {
+    return targetBranch;
+  }
+
+  public void setTargetBranch(String targetBranch) {
+    this.targetBranch = targetBranch;
+  }
+
+  public boolean isValid() {
+    return !Strings.isNullOrEmpty(getBranchToMerge()) && !Strings.isNullOrEmpty(getTargetBranch());
+  }
+
+  public void reset() {
+    this.setBranchToMerge(null);
+    this.setTargetBranch(null);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (obj == null) {
+      return false;
+    }
+
+    if (getClass() != obj.getClass()) {
+      return false;
+    }
+
+    final MergeDryRunCommandRequest other = (MergeDryRunCommandRequest) obj;
+
+    return Objects.equal(branchToMerge, other.branchToMerge)
+      && Objects.equal(targetBranch, other.targetBranch);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(branchToMerge, targetBranch);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+      .add("branchToMerge", branchToMerge)
+      .add("targetBranch", targetBranch)
+      .toString();
+  }
+}
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java b/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
index 77201d1a72..33dd137302 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
@@ -259,4 +259,12 @@ public abstract class RepositoryServiceProvider implements Closeable
   {
     throw new CommandNotSupportedException(Command.MERGE);
   }
+
+  /**
+   * @since 2.0
+   */
+  public MergeDryRunCommand getMergeDryRunCommand()
+  {
+    throw new CommandNotSupportedException(Command.MERGE_DRY_RUN);
+  }
 }

From e0cc99a3d83ef6905f0efad946252d46d42a8a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 6 Nov 2018 14:40:55 +0100
Subject: [PATCH 113/188] Implement simple merge dry run

---
 .../repository/spi/GitMergeDryRunCommand.java | 25 +++++++++++++++++++
 .../spi/GitRepositoryServiceProvider.java     |  9 +++++--
 .../spi/GitMergeDryRunCommandTest.java        | 23 +++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeDryRunCommand.java
 create mode 100644 scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeDryRunCommandTest.java

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeDryRunCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeDryRunCommand.java
new file mode 100644
index 0000000000..e49c520457
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeDryRunCommand.java
@@ -0,0 +1,25 @@
+package sonia.scm.repository.spi;
+
+import org.eclipse.jgit.merge.MergeStrategy;
+import org.eclipse.jgit.merge.ResolveMerger;
+import sonia.scm.repository.InternalRepositoryException;
+import sonia.scm.repository.Repository;
+
+import java.io.IOException;
+
+public class GitMergeDryRunCommand extends AbstractGitCommand implements MergeDryRunCommand {
+  GitMergeDryRunCommand(GitContext context, Repository repository) {
+    super(context, repository);
+  }
+
+  @Override
+  public boolean isMergeable(MergeDryRunCommandRequest request) {
+    try {
+      org.eclipse.jgit.lib.Repository repository = context.open();
+      ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
+      return merger.merge(repository.resolve(request.getBranchToMerge()), repository.resolve(request.getTargetBranch()));
+    } catch (IOException e) {
+      throw new InternalRepositoryException(e);
+    }
+  }
+}
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
index d60abd424d..dd6c1b5492 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
@@ -63,7 +63,8 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
     Command.INCOMING,
     Command.OUTGOING,
     Command.PUSH,
-    Command.PULL
+    Command.PULL,
+    Command.MERGE_DRY_RUN
   );
   //J+
 
@@ -240,7 +241,11 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
     return new GitTagsCommand(context, repository);
   }
 
-  //~--- fields ---------------------------------------------------------------
+  @Override
+  public MergeDryRunCommand getMergeDryRunCommand() {
+    return new GitMergeDryRunCommand(context, repository);
+  }
+//~--- fields ---------------------------------------------------------------
 
   /** Field description */
   private GitContext context;
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeDryRunCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeDryRunCommandTest.java
new file mode 100644
index 0000000000..891b8537dd
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeDryRunCommandTest.java
@@ -0,0 +1,23 @@
+package sonia.scm.repository.spi;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class GitMergeDryRunCommandTest extends AbstractGitCommandTestBase {
+  @Test
+  public void shouldDetectNotMergeableBranches() {
+    GitMergeDryRunCommand command = createCommand();
+    MergeDryRunCommandRequest request = new MergeDryRunCommandRequest();
+    request.setBranchToMerge("test-branch");
+    request.setTargetBranch("master");
+
+    boolean mergeable = command.isMergeable(request);
+
+    Assert.assertFalse(mergeable);
+  }
+
+  private GitMergeDryRunCommand createCommand()
+  {
+    return new GitMergeDryRunCommand(createContext(), repository);
+  }
+}

From 4086622647d1843aa0e78ed2e4d20ca714c80582 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Tue, 6 Nov 2018 15:25:49 +0100
Subject: [PATCH 114/188] Renamed function for clarity

---
 scm-ui/src/users/components/SetUserPassword.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scm-ui/src/users/components/SetUserPassword.js b/scm-ui/src/users/components/SetUserPassword.js
index a4a91c4083..19872cb9a2 100644
--- a/scm-ui/src/users/components/SetUserPassword.js
+++ b/scm-ui/src/users/components/SetUserPassword.js
@@ -40,7 +40,7 @@ class SetUserPassword extends React.Component<Props, State> {
     };
   }
 
-  isValid = () => {
+  passwordIsValid = () => {
     return !(
       this.state.validatePasswordError || this.state.passwordValidationError
     );
@@ -74,9 +74,8 @@ class SetUserPassword extends React.Component<Props, State> {
   };
 
   submit = (event: Event) => {
-    //TODO: set loading
     event.preventDefault();
-    if (this.isValid()) {
+    if (this.passwordIsValid()) {
       const { user } = this.props;
       const { password } = this.state;
       this.setLoadingState();
@@ -132,7 +131,7 @@ class SetUserPassword extends React.Component<Props, State> {
           helpText={t("help.passwordConfirmHelpText")}
         />
         <SubmitButton
-          disabled={!this.isValid()}
+          disabled={!this.passwordIsValid()}
           loading={loading}
           label={t("user-form.submit")}
         />

From 6e32d354cf5d8230023f1a6a7ed1f597d747d1f1 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Tue, 6 Nov 2018 15:26:25 +0100
Subject: [PATCH 115/188] Renamed incorrectly named variable

---
 scm-ui/src/users/components/updatePassword.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scm-ui/src/users/components/updatePassword.js b/scm-ui/src/users/components/updatePassword.js
index e2ef8c0a02..3915c90bd9 100644
--- a/scm-ui/src/users/components/updatePassword.js
+++ b/scm-ui/src/users/components/updatePassword.js
@@ -1,10 +1,11 @@
 //@flow
 import { apiClient } from "@scm-manager/ui-components";
-const CONTENT_TYPE_USER = "application/vnd.scmm-passwordOverwrite+json;v=2";
+const CONTENT_TYPE_PASSWORD_OVERWRITE =
+  "application/vnd.scmm-passwordOverwrite+json;v=2";
 
 export function updatePassword(url: string, password: string) {
   return apiClient
-    .put(url, { newPassword: password }, CONTENT_TYPE_USER)
+    .put(url, { newPassword: password }, CONTENT_TYPE_PASSWORD_OVERWRITE)
     .then(response => {
       return response;
     })

From 081cd93c51eaedf9ee7101bcaec526d12f094085 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Tue, 6 Nov 2018 15:27:01 +0100
Subject: [PATCH 116/188] Polished pw labels

---
 scm-ui/public/locales/en/users.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json
index b5b98fc915..7199cb2135 100644
--- a/scm-ui/public/locales/en/users.json
+++ b/scm-ui/public/locales/en/users.json
@@ -52,11 +52,11 @@
     "name-invalid": "This name is invalid",
     "displayname-invalid": "This displayname is invalid",
     "password-invalid": "Password has to be between 6 and 32 characters",
-    "passwordValidation-invalid": "Passwords have to be the same",
-    "validatePassword": "Please validate password here"
+    "passwordValidation-invalid": "Passwords have to be identical",
+    "validatePassword": "Confirm password"
   },
   "password": {
-    "set-password-successful": "Password is set successful"
+    "set-password-successful": "Password successfully set"
   },
   "help": {
     "usernameHelpText": "Unique name of the user.",

From 21793153011619cc15f2d06dd3089811c5189ca0 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Tue, 6 Nov 2018 15:31:04 +0000
Subject: [PATCH 117/188] Close branch feature/ui-AdminPasswordChange


From d230511ad8e1508875db25ca4957ba7455307eed Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 6 Nov 2018 16:36:11 +0100
Subject: [PATCH 118/188] added abstraction for global configurations, to
 simplify plugin development

---
 .../packages/ui-components/package.json       |  25 ++-
 .../src/config/ConfigurationBinder.js         |  43 +++++
 .../src/config/GlobalConfiguration.js         | 162 ++++++++++++++++++
 .../ui-components/src/config/index.js         |   3 +
 .../packages/ui-components/src/index.js       |   1 +
 .../packages/ui-components/yarn.lock          |  32 ++++
 6 files changed, 259 insertions(+), 7 deletions(-)
 create mode 100644 scm-ui-components/packages/ui-components/src/config/ConfigurationBinder.js
 create mode 100644 scm-ui-components/packages/ui-components/src/config/GlobalConfiguration.js
 create mode 100644 scm-ui-components/packages/ui-components/src/config/index.js

diff --git a/scm-ui-components/packages/ui-components/package.json b/scm-ui-components/packages/ui-components/package.json
index 1288448908..48cf089aba 100644
--- a/scm-ui-components/packages/ui-components/package.json
+++ b/scm-ui-components/packages/ui-components/package.json
@@ -3,10 +3,12 @@
   "version": "0.0.1",
   "description": "UI Components for SCM-Manager and its plugins",
   "main": "src/index.js",
-  "files": ["src"],
+  "files": [
+    "src"
+  ],
   "repository": "https://bitbucket.org/sdorra/scm-manager",
   "author": "Sebastian Sdorra <sebastian.sdorra@cloudogu.com>",
-  "license" : "BSD-3-Clause",
+  "license": "BSD-3-Clause",
   "scripts": {
     "update-index": "create-index -r src",
     "eslint-fix": "eslint src --fix"
@@ -23,23 +25,32 @@
     "react-router-enzyme-context": "^1.2.0"
   },
   "dependencies": {
+    "@scm-manager/ui-extensions": "^0.0.7",
+    "@scm-manager/ui-types": "0.0.1",
     "classnames": "^2.2.6",
     "moment": "^2.22.2",
     "react": "^16.5.2",
     "react-dom": "^16.5.2",
     "react-i18next": "^7.11.0",
     "react-jss": "^8.6.1",
-    "react-router-dom": "^4.3.1",
-    "@scm-manager/ui-types": "0.0.1"
+    "react-router-dom": "^4.3.1"
   },
   "browserify": {
     "transform": [
-      ["browserify-css"],
+      [
+        "browserify-css"
+      ],
       [
         "babelify",
         {
-          "plugins": ["@babel/plugin-proposal-class-properties"],
-          "presets": ["@babel/preset-env", "@babel/preset-flow", "@babel/preset-react"]
+          "plugins": [
+            "@babel/plugin-proposal-class-properties"
+          ],
+          "presets": [
+            "@babel/preset-env",
+            "@babel/preset-flow",
+            "@babel/preset-react"
+          ]
         }
       ]
     ]
diff --git a/scm-ui-components/packages/ui-components/src/config/ConfigurationBinder.js b/scm-ui-components/packages/ui-components/src/config/ConfigurationBinder.js
new file mode 100644
index 0000000000..477eee5238
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/src/config/ConfigurationBinder.js
@@ -0,0 +1,43 @@
+// @flow
+import React from "react";
+import { binder } from "@scm-manager/ui-extensions";
+import { NavLink } from "../navigation";
+import { Route } from "react-router-dom";
+import { translate } from "react-i18next";
+
+class ConfigurationBinder {
+
+  i18nNamespace: string = "plugins";
+
+  bindGlobal(to: string, labelI18nKey: string, linkName: string, ConfigurationComponent: any) {
+
+    // create predicate based on the link name of the index resource
+    // if the linkname is not available, the navigation link and the route are not bound to the extension points
+    const configPredicate = (props: Object) => {
+      return props.links && props.links[linkName];
+    };
+
+    // create NavigationLink with translated label
+    const ConfigNavLink = translate(this.i18nNamespace)(({t}) => {
+      return <NavLink to={"/config" + to} label={t(labelI18nKey)} />;
+    });
+
+    // bind navigation link to extension point
+    binder.bind("config.navigation", ConfigNavLink, configPredicate);
+
+
+    // route for global configuration, passes the link from the index resource to component
+    const ConfigRoute = ({ url, links }) => {
+      const link = links[linkName].href;
+      return <Route path={url + to}
+                    render={() => <ConfigurationComponent link={link}/>}
+                    exact/>;
+    };
+
+    // bind config route to extension point
+    binder.bind("config.route", ConfigRoute, configPredicate);
+  }
+
+}
+
+export default new ConfigurationBinder();
diff --git a/scm-ui-components/packages/ui-components/src/config/GlobalConfiguration.js b/scm-ui-components/packages/ui-components/src/config/GlobalConfiguration.js
new file mode 100644
index 0000000000..b2b7dca647
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/src/config/GlobalConfiguration.js
@@ -0,0 +1,162 @@
+//@flow
+import React from "react";
+import { translate } from "react-i18next";
+import type { Links } from "@scm-manager/ui-types";
+import {
+  apiClient,
+  SubmitButton,
+  Loading,
+  ErrorNotification
+} from "../";
+
+type RenderProps = {
+  readOnly: boolean,
+  initialConfiguration: Configuration,
+  onConfigurationChange: (Configuration, boolean) => void
+};
+
+type Props = {
+  link: string,
+  render: (props: RenderProps) => any, // ???
+
+  // context props
+  t: (string) => string
+};
+
+type Configuration =  {
+  _links: Links
+} & Object;
+
+type State = {
+  error?: Error,
+  fetching: boolean,
+  modifying: boolean,
+  contentType?: string,
+
+  configuration?: Configuration,
+  modifiedConfiguration?: Configuration,
+  valid: boolean
+};
+
+/**
+ * GlobalConfiguration uses the render prop pattern to encapsulate the logic for
+ * synchronizing the configuration with the backend.
+ */
+class GlobalConfiguration extends React.Component<Props, State> {
+
+  constructor(props: Props) {
+    super(props);
+    this.state = {
+      fetching: true,
+      modifying: false,
+      valid: false
+    };
+  }
+
+  componentDidMount() {
+    const { link } = this.props;
+
+    apiClient.get(link)
+      .then(this.captureContentType)
+      .then(response => response.json())
+      .then(this.loadConfig)
+      .catch(this.handleError);
+  }
+
+  captureContentType = (response: Response) => {
+    const contentType = response.headers.get("Content-Type");
+    this.setState({
+      contentType
+    });
+    return response;
+  };
+
+  getContentType = (): string => {
+    const { contentType } = this.state;
+    return contentType ? contentType : "application/json";
+  };
+
+  handleError = (error: Error) => {
+    this.setState({
+      error,
+      fetching: false,
+      modifying: false
+    });
+  };
+
+  loadConfig = (configuration: Configuration) => {
+    this.setState({
+      configuration,
+      fetching: false,
+      error: undefined
+    });
+  };
+
+  getModificationUrl = (): ?string => {
+    const { configuration } = this.state;
+    if (configuration) {
+      const links = configuration._links;
+      if (links && links.update) {
+        return links.update.href;
+      }
+    }
+  };
+
+  isReadOnly = (): boolean => {
+    const modificationUrl = this.getModificationUrl();
+    return !modificationUrl;
+  };
+
+  configurationChanged = (configuration: Configuration, valid: boolean) => {
+    this.setState({
+      modifiedConfiguration: configuration,
+      valid
+    });
+  };
+
+  modifyConfiguration = (event: Event) => {
+    event.preventDefault();
+
+    this.setState({ modifying: true });
+
+    const {modifiedConfiguration} = this.state;
+
+    apiClient.put(this.getModificationUrl(), modifiedConfiguration, this.getContentType())
+      .then(() => this.setState({ modifying: false }))
+      .catch(this.handleError);
+  };
+
+  render() {
+    const { t } = this.props;
+    const { fetching, error, configuration, modifying, valid } = this.state;
+
+    if (error) {
+      return <ErrorNotification error={error}/>;
+    } else if (fetching || !configuration) {
+      return <Loading />;
+    } else {
+      const readOnly = this.isReadOnly();
+
+      const renderProps: RenderProps = {
+        readOnly,
+        initialConfiguration: configuration,
+        onConfigurationChange: this.configurationChanged
+      };
+
+      return (
+        <form onSubmit={this.modifyConfiguration}>
+          { this.props.render(renderProps) }
+          <hr/>
+          <SubmitButton
+            label={t("config-form.submit")}
+            disabled={!valid || readOnly}
+            loading={modifying}
+          />
+        </form>
+      );
+    }
+  }
+
+}
+
+export default translate("config")(GlobalConfiguration);
diff --git a/scm-ui-components/packages/ui-components/src/config/index.js b/scm-ui-components/packages/ui-components/src/config/index.js
new file mode 100644
index 0000000000..9596e9cda5
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/src/config/index.js
@@ -0,0 +1,3 @@
+// @flow
+export { default as ConfigurationBinder } from "./ConfigurationBinder";
+export { default as GlobalConfiguration } from "./GlobalConfiguration";
diff --git a/scm-ui-components/packages/ui-components/src/index.js b/scm-ui-components/packages/ui-components/src/index.js
index 196c33c08f..2ebe57ec0c 100644
--- a/scm-ui-components/packages/ui-components/src/index.js
+++ b/scm-ui-components/packages/ui-components/src/index.js
@@ -24,6 +24,7 @@ export { getPageFromMatch } from "./urls";
 export { apiClient, NOT_FOUND_ERROR, UNAUTHORIZED_ERROR } from "./apiclient.js";
 
 export * from "./buttons";
+export * from "./config";
 export * from "./forms";
 export * from "./layout";
 export * from "./modals";
diff --git a/scm-ui-components/packages/ui-components/yarn.lock b/scm-ui-components/packages/ui-components/yarn.lock
index 49f638e049..886ee3f0fd 100644
--- a/scm-ui-components/packages/ui-components/yarn.lock
+++ b/scm-ui-components/packages/ui-components/yarn.lock
@@ -681,6 +681,13 @@
     vinyl-source-stream "^2.0.0"
     watchify "^3.11.0"
 
+"@scm-manager/ui-extensions@^0.0.7":
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.0.7.tgz#a0a657a1410b78838ba0b36096ef631dca7fe27e"
+  dependencies:
+    react "^16.4.2"
+    react-dom "^16.4.2"
+
 "@types/node@*":
   version "10.12.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.0.tgz#ea6dcbddbc5b584c83f06c60e82736d8fbb0c235"
@@ -6229,6 +6236,15 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+react-dom@^16.4.2:
+  version "16.6.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.6.0.tgz#6375b8391e019a632a89a0988bce85f0cc87a92f"
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    scheduler "^0.10.0"
+
 react-dom@^16.5.2:
   version "16.5.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7"
@@ -6299,6 +6315,15 @@ react-test-renderer@^16.0.0-0:
     react-is "^16.5.2"
     schedule "^0.5.0"
 
+react@^16.4.2:
+  version "16.6.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.6.0.tgz#b34761cfaf3e30f5508bc732fb4736730b7da246"
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    scheduler "^0.10.0"
+
 react@^16.5.2:
   version "16.5.2"
   resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42"
@@ -6726,6 +6751,13 @@ schedule@^0.5.0:
   dependencies:
     object-assign "^4.1.1"
 
+scheduler@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.10.0.tgz#7988de90fe7edccc774ea175a783e69c40c521e1"
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
 "semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"

From c14e8d654b6c9e2b97d10a8fee5ea44afbd68115 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 6 Nov 2018 16:37:39 +0100
Subject: [PATCH 119/188] added name to select component and fixed wrong type
 for value

---
 .../packages/ui-components/src/forms/Select.js    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scm-ui-components/packages/ui-components/src/forms/Select.js b/scm-ui-components/packages/ui-components/src/forms/Select.js
index 880b375999..c3956ea8f3 100644
--- a/scm-ui-components/packages/ui-components/src/forms/Select.js
+++ b/scm-ui-components/packages/ui-components/src/forms/Select.js
@@ -9,10 +9,11 @@ export type SelectItem = {
 };
 
 type Props = {
+  name?: string,
   label?: string,
   options: SelectItem[],
-  value?: SelectItem,
-  onChange: string => void,
+  value?: string,
+  onChange: (value: string, name?: string) => void,
   loading?: boolean,
   helpText?: string
 };
@@ -29,7 +30,7 @@ class Select extends React.Component<Props> {
   }
 
   handleInput = (event: SyntheticInputEvent<HTMLSelectElement>) => {
-    this.props.onChange(event.target.value);
+    this.props.onChange(event.target.value, this.props.name);
   };
 
   render() {
@@ -40,10 +41,10 @@ class Select extends React.Component<Props> {
     return (
       <div className="field">
         <LabelWithHelpIcon label={label} helpText={helpText} />
-    <div className={classNames(
-      "control select",
-      loadingClass
-    )}>
+        <div className={classNames(
+          "control select",
+          loadingClass
+        )}>
           <select
             ref={input => {
               this.field = input;

From f5f96042b33a5456f7be0fc347ef982b1addeea5 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 6 Nov 2018 16:38:49 +0100
Subject: [PATCH 120/188] use global configuration abstraction to implement
 global configuration for git

---
 scm-plugins/scm-git-plugin/package.json       |   2 +-
 .../src/main/js/GitConfiguration.js           | 183 ------------------
 .../src/main/js/GitConfigurationForm.js       |  79 ++++++++
 .../src/main/js/GitConfigurationNavLink.js    |  21 --
 .../src/main/js/GitConfigurationRoute.js      |  25 ---
 .../src/main/js/GitGlobalConfiguration.js     |  32 +++
 .../scm-git-plugin/src/main/js/index.js       |  12 +-
 7 files changed, 116 insertions(+), 238 deletions(-)
 delete mode 100644 scm-plugins/scm-git-plugin/src/main/js/GitConfiguration.js
 create mode 100644 scm-plugins/scm-git-plugin/src/main/js/GitConfigurationForm.js
 delete mode 100644 scm-plugins/scm-git-plugin/src/main/js/GitConfigurationNavLink.js
 delete mode 100644 scm-plugins/scm-git-plugin/src/main/js/GitConfigurationRoute.js
 create mode 100644 scm-plugins/scm-git-plugin/src/main/js/GitGlobalConfiguration.js

diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json
index 2774af8b26..f295924923 100644
--- a/scm-plugins/scm-git-plugin/package.json
+++ b/scm-plugins/scm-git-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scm-manager/scm-git-plugin",
-  "license" : "BSD-3-Clause",
+  "license": "BSD-3-Clause",
   "main": "src/main/js/index.js",
   "scripts": {
     "build": "ui-bundler plugin",
diff --git a/scm-plugins/scm-git-plugin/src/main/js/GitConfiguration.js b/scm-plugins/scm-git-plugin/src/main/js/GitConfiguration.js
deleted file mode 100644
index d886256d32..0000000000
--- a/scm-plugins/scm-git-plugin/src/main/js/GitConfiguration.js
+++ /dev/null
@@ -1,183 +0,0 @@
-//@flow
-import React from "react";
-import { translate } from "react-i18next";
-import type { Links } from "@scm-manager/ui-types";
-import {
-  apiClient,
-  Title,
-  InputField,
-  Checkbox,
-  SubmitButton,
-  Loading,
-  ErrorNotification
-} from "@scm-manager/ui-components";
-
-type Props = {
-  url: string,
-
-  // context props
-  t: (string) => string
-};
-
-type Configuration = {
-  repositoryDirectory?: string,
-  gcExpression?: string,
-  disabled: boolean,
-  _links?: Links
-}
-
-type State = Configuration & {
-  error?: Error,
-  fetching: boolean,
-  modifying: boolean
-};
-
-class GitConfiguration extends React.Component<Props, State> {
-
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      disabled: false,
-      fetching: true,
-      modifying: false
-    };
-  }
-
-  componentDidMount() {
-    const { url } = this.props;
-
-    // TODO capture content-type for sending
-
-    apiClient.get(url)
-      .then(response => response.json())
-      .then(this.loadConfig)
-      .catch(this.handleError);
-  }
-
-  handleError = (error: Error) => {
-    this.setState({
-      error,
-      fetching: false,
-      modifying: false
-    });
-  };
-
-  loadConfig = (configuration: Configuration) => {
-    this.setState({
-      ...configuration,
-      fetching: false,
-      error: undefined
-    });
-  };
-
-  handleInputChange = (value: string, name: string) => {
-    this.setState({
-      [name]: value
-    });
-  };
-
-  handleCheckboxChange = (value: boolean, name: string) => {
-    this.setState({
-      [name]: value
-    });
-  };
-
-  isValid = (): boolean => {
-    const { repositoryDirectory } = this.state;
-    return !!repositoryDirectory;
-  };
-
-  getModificationUrl = (): ?string => {
-    const links = this.state._links;
-    if (links && links.update) {
-      return links.update.href;
-    }
-  };
-
-  isReadOnly = (): boolean => {
-    const links = this.state._links;
-    return !links || !links.update;
-  };
-
-  render() {
-    const { fetching, error } = this.state;
-
-    if (error) {
-      return this.renderWithFrame(<ErrorNotification error={error}/>);
-    } else if (fetching) {
-      return this.renderWithFrame(<Loading/>);
-    }
-
-    return this.renderForm();
-  }
-
-  renderWithFrame(child) {
-    const { t } = this.props;
-    return (
-      <div>
-        <Title title={t("scm-git-plugin.config.title")}/>
-        {child}
-      </div>
-    );
-  }
-
-  modifyConfiguration = (event: Event) => {
-    event.preventDefault();
-
-    this.setState({ modifying: true });
-
-    const { repositoryDirectory, gcExpression, disabled } = this.state;
-
-    const configuration = {
-      repositoryDirectory,
-      gcExpression,
-      disabled
-    };
-
-    apiClient.put(this.getModificationUrl(), configuration, "application/vnd.scmm-gitconfig+json;v=2")
-      .then(() => this.setState({ modifying: false }))
-      .catch(this.handleError);
-  };
-
-  renderForm() {
-    const { repositoryDirectory, gcExpression, disabled, modifying } = this.state;
-
-    const { t } = this.props;
-    const readOnly = this.isReadOnly();
-
-    return this.renderWithFrame(
-      <form onSubmit={this.modifyConfiguration}>
-        <InputField name="repositoryDirectory"
-                    label={t("scm-git-plugin.config.directory")}
-                    helpText={t("scm-git-plugin.config.directoryHelpText")}
-                    value={repositoryDirectory}
-                    onChange={this.handleInputChange}
-                    disabled={readOnly}
-        />
-        <InputField name="gcExpression"
-                    label={t("scm-git-plugin.config.gcExpression")}
-                    helpText={t("scm-git-plugin.config.gcExpressionHelpText")}
-                    value={gcExpression}
-                    onChange={this.handleInputChange}
-                    disabled={readOnly}
-        />
-        <Checkbox name="disabled"
-                  label={t("scm-git-plugin.config.disabled")}
-                  helpText={t("scm-git-plugin.config.disabledHelpText")}
-                  checked={disabled}
-                  onChange={this.handleCheckboxChange}
-                  disabled={readOnly}
-        />
-        <hr/>
-        <SubmitButton
-          label={t("scm-git-plugin.config.submit")}
-          disabled={!this.isValid() || readOnly}
-          loading={modifying}
-        />
-      </form>
-    );
-  }
-
-}
-
-export default translate("plugins")(GitConfiguration);
diff --git a/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationForm.js b/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationForm.js
new file mode 100644
index 0000000000..630984ad87
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationForm.js
@@ -0,0 +1,79 @@
+//@flow
+import React from "react";
+import { translate } from "react-i18next";
+import type { Links } from "@scm-manager/ui-types";
+
+import { InputField, Checkbox } from "@scm-manager/ui-components";
+
+type Configuration = {
+  repositoryDirectory?: string,
+  gcExpression?: string,
+  disabled: boolean,
+  _links: Links
+}
+
+type Props = {
+  initialConfiguration: Configuration,
+  readOnly: boolean,
+
+  onConfigurationChange: (Configuration, boolean) => void,
+
+  // context props
+  t: (string) => string
+}
+
+type State = Configuration & {
+
+}
+
+class GitConfigurationForm extends React.Component<Props, State> {
+
+  constructor(props: Props) {
+    super(props);
+    this.state = { ...props.initialConfiguration };
+  }
+
+  isValid = () => {
+    return !!this.state.repositoryDirectory;
+  };
+
+  handleChange = (value: any, name: string) => {
+    this.setState({
+      [name]: value
+    }, () => this.props.onConfigurationChange(this.state, this.isValid()));
+  };
+
+  render() {
+    const { repositoryDirectory, gcExpression, disabled } = this.state;
+    const { readOnly, t } = this.props;
+
+    return (
+      <>
+        <InputField name="repositoryDirectory"
+                    label={t("scm-git-plugin.config.directory")}
+                    helpText={t("scm-git-plugin.config.directoryHelpText")}
+                    value={repositoryDirectory}
+                    onChange={this.handleChange}
+                    disabled={readOnly}
+        />
+        <InputField name="gcExpression"
+                    label={t("scm-git-plugin.config.gcExpression")}
+                    helpText={t("scm-git-plugin.config.gcExpressionHelpText")}
+                    value={gcExpression}
+                    onChange={this.handleChange}
+                    disabled={readOnly}
+        />
+        <Checkbox name="disabled"
+                  label={t("scm-git-plugin.config.disabled")}
+                  helpText={t("scm-git-plugin.config.disabledHelpText")}
+                  checked={disabled}
+                  onChange={this.handleChange}
+                  disabled={readOnly}
+        />
+      </>
+    );
+  }
+
+}
+
+export default translate("plugins")(GitConfigurationForm);
diff --git a/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationNavLink.js b/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationNavLink.js
deleted file mode 100644
index 5c8375bc25..0000000000
--- a/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationNavLink.js
+++ /dev/null
@@ -1,21 +0,0 @@
-//@flow
-import React from "react";
-import { NavLink } from "@scm-manager/ui-components";
-import { translate } from "react-i18next";
-
-type Props = {
-  url: string,
-
-  // context props
-  t: (string) => string
-}
-class GitConfigurationNavLink extends React.Component<Props> {
-
-  render() {
-    const { url, t } = this.props;
-    return <NavLink to={`${url}/git`} label={t("scm-git-plugin.config.link")} />;
-  }
-
-}
-
-export default translate("plugins")(GitConfigurationNavLink);
diff --git a/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationRoute.js b/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationRoute.js
deleted file mode 100644
index 3d183e3ee9..0000000000
--- a/scm-plugins/scm-git-plugin/src/main/js/GitConfigurationRoute.js
+++ /dev/null
@@ -1,25 +0,0 @@
-//@flow
-import React from "react";
-import type { Links } from "@scm-manager/ui-types";
-import GitConfiguration from "./GitConfiguration";
-import { Route } from "react-router-dom";
-
-type Props = {
-  url: string,
-  links: Links
-}
-
-class GitConfigurationRoute extends React.Component<Props> {
-
-  render() {
-    const { url, links } = this.props;
-
-    const configLink = links["gitConfig"].href;
-    return <Route path={url + "/git"}
-                  component={() => <GitConfiguration url={configLink} />}
-                  exact />;
-  }
-
-}
-
-export default GitConfigurationRoute;
diff --git a/scm-plugins/scm-git-plugin/src/main/js/GitGlobalConfiguration.js b/scm-plugins/scm-git-plugin/src/main/js/GitGlobalConfiguration.js
new file mode 100644
index 0000000000..3718cc2900
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/js/GitGlobalConfiguration.js
@@ -0,0 +1,32 @@
+//@flow
+import React from "react";
+import { translate } from "react-i18next";
+import { Title, GlobalConfiguration } from "@scm-manager/ui-components";
+import GitConfigurationForm from "./GitConfigurationForm";
+
+type Props = {
+  link: string,
+
+  t: (string) => string
+};
+
+class GitGlobalConfiguration extends React.Component<Props> {
+
+  constructor(props: Props) {
+    super(props);
+  }
+
+  render() {
+    const { link, t } = this.props;
+
+    return (
+      <div>
+        <Title title={t("scm-git-plugin.config.title")}/>
+        <GlobalConfiguration link={link} render={props => <GitConfigurationForm {...props} />}/>
+      </div>
+    );
+  }
+
+}
+
+export default translate("plugins")(GitGlobalConfiguration);
diff --git a/scm-plugins/scm-git-plugin/src/main/js/index.js b/scm-plugins/scm-git-plugin/src/main/js/index.js
index 815f016b88..3f91405509 100644
--- a/scm-plugins/scm-git-plugin/src/main/js/index.js
+++ b/scm-plugins/scm-git-plugin/src/main/js/index.js
@@ -2,8 +2,9 @@
 import { binder } from "@scm-manager/ui-extensions";
 import ProtocolInformation from "./ProtocolInformation";
 import GitAvatar from "./GitAvatar";
-import GitConfigurationNavLink from "./GitConfigurationNavLink";
-import GitConfigurationRoute from "./GitConfigurationRoute";
+
+import { ConfigurationBinder as cfgBinder } from "@scm-manager/ui-components";
+import GitGlobalConfiguration from "./GitGlobalConfiguration";
 
 // repository
 
@@ -16,9 +17,4 @@ binder.bind("repos.repository-avatar", GitAvatar, gitPredicate);
 
 // global config
 
-const gitConfigPredicate = (props: Object) => {
-  return props.links && props.links["gitConfig"];
-};
-
-binder.bind("config.navigation", GitConfigurationNavLink, gitConfigPredicate);
-binder.bind("config.route", GitConfigurationRoute, gitConfigPredicate);
+cfgBinder.bindGlobal("/git", "scm-git-plugin.config.link", "gitConfig", GitGlobalConfiguration);

From 9c043145a2403fa7cf829eb6b3c743ff9e061762 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 6 Nov 2018 16:39:11 +0100
Subject: [PATCH 121/188] implemented global configuration for mercurial

---
 .../src/main/js/HgConfigurationForm.js        | 117 ++++++++++++++++++
 .../src/main/js/HgGlobalConfiguration.js      |  28 +++++
 .../scm-hg-plugin/src/main/js/index.js        |   6 +
 .../main/resources/locales/en/plugins.json    |  21 ++++
 4 files changed, 172 insertions(+)
 create mode 100644 scm-plugins/scm-hg-plugin/src/main/js/HgConfigurationForm.js
 create mode 100644 scm-plugins/scm-hg-plugin/src/main/js/HgGlobalConfiguration.js

diff --git a/scm-plugins/scm-hg-plugin/src/main/js/HgConfigurationForm.js b/scm-plugins/scm-hg-plugin/src/main/js/HgConfigurationForm.js
new file mode 100644
index 0000000000..aa6e3ac206
--- /dev/null
+++ b/scm-plugins/scm-hg-plugin/src/main/js/HgConfigurationForm.js
@@ -0,0 +1,117 @@
+//@flow
+import React from "react";
+import type { Links } from "@scm-manager/ui-types";
+import { translate } from "react-i18next";
+import { InputField, Checkbox } from "@scm-manager/ui-components";
+
+type Configuration = {
+  "hgBinary": string,
+  "pythonBinary": string,
+  "pythonPath"?: string,
+  "repositoryDirectory": string,
+  "encoding": string,
+  "useOptimizedBytecode": boolean,
+  "showRevisionInId": boolean,
+  "disabled": boolean,
+  "_links": Links
+};
+
+type Props = {
+  initialConfiguration: Configuration,
+  readOnly: boolean,
+
+  onConfigurationChange: (Configuration, boolean) => void,
+
+  // context props
+  t: (string) => string
+}
+
+type State = Configuration & {
+  validationErrors: string[]
+};
+
+class HgConfigurationForm extends React.Component<Props, State> {
+
+  constructor(props: Props) {
+    super(props);
+    this.state = { ...props.initialConfiguration, validationErrors: [] };
+  }
+
+  updateValidationStatus = () => {
+    const requiredFields = [
+      "hgBinary", "pythonBinary", "repositoryDirectory", "encoding"
+    ];
+
+    const validationErrors = [];
+    for (let field of requiredFields) {
+      if (!this.state[field]) {
+        validationErrors.push( field );
+      }
+    }
+
+    this.setState({
+      validationErrors
+    });
+  };
+
+  isValid = () => {
+    return this.state.validationErrors.length === 0;
+  };
+
+  hasValidationError = (name: string) => {
+    return this.state.validationErrors.indexOf(name) >= 0;
+  };
+
+  handleChange = (value: any, name: string) => {
+    this.setState({
+      [name]: value
+    }, () => {
+      this.updateValidationStatus();
+      this.props.onConfigurationChange(this.state, this.isValid());
+    });
+  };
+
+  inputField = (name: string) => {
+    const { readOnly, t } = this.props;
+    return <InputField
+      name={ name }
+      label={t("scm-hg-plugin.config." + name)}
+      helpText={t("scm-hg-plugin.config." + name + "HelpText")}
+      value={this.state[name]}
+      onChange={this.handleChange}
+      validationError={this.hasValidationError(name)}
+      errorMessage={t("scm-hg-plugin.config.required")}
+      disabled={readOnly}
+    />;
+  };
+
+  checkbox = (name: string) => {
+    const { readOnly, t } = this.props;
+    return <Checkbox
+      name={ name }
+      label={t("scm-hg-plugin.config." + name)}
+      helpText={t("scm-hg-plugin.config." + name + "HelpText")}
+      checked={this.state[name]}
+      onChange={this.handleChange}
+      disabled={readOnly}
+    />;
+  };
+
+  render() {
+    return (
+      <>
+        {this.inputField("hgBinary")}
+        {this.inputField("pythonBinary")}
+        {this.inputField("pythonPath")}
+        {this.inputField("repositoryDirectory")}
+        {this.inputField("encoding")}
+        {this.checkbox("useOptimizedBytecode")}
+        {this.checkbox("showRevisionInId")}
+        {this.checkbox("disabled")}
+      </>
+    );
+  }
+
+}
+
+export default translate("plugins")(HgConfigurationForm);
diff --git a/scm-plugins/scm-hg-plugin/src/main/js/HgGlobalConfiguration.js b/scm-plugins/scm-hg-plugin/src/main/js/HgGlobalConfiguration.js
new file mode 100644
index 0000000000..e92672a282
--- /dev/null
+++ b/scm-plugins/scm-hg-plugin/src/main/js/HgGlobalConfiguration.js
@@ -0,0 +1,28 @@
+//@flow
+import React from "react";
+import { Title, GlobalConfiguration } from "@scm-manager/ui-components";
+import { translate } from "react-i18next";
+import HgConfigurationForm from "./HgConfigurationForm";
+
+type Props = {
+  link: string,
+
+  // context props
+  t: (string) => string
+}
+
+class HgGlobalConfiguration extends React.Component<Props> {
+
+  render() {
+    const  { link, t } = this.props;
+    return (
+      <div>
+        <Title title={t("scm-hg-plugin.config.title")}/>
+        <GlobalConfiguration link={link} render={props => <HgConfigurationForm {...props} />}/>
+      </div>
+    );
+  }
+
+}
+
+export default translate("plugins")(HgGlobalConfiguration);
diff --git a/scm-plugins/scm-hg-plugin/src/main/js/index.js b/scm-plugins/scm-hg-plugin/src/main/js/index.js
index f2ebff97c3..a1fa72f5bd 100644
--- a/scm-plugins/scm-hg-plugin/src/main/js/index.js
+++ b/scm-plugins/scm-hg-plugin/src/main/js/index.js
@@ -2,6 +2,8 @@
 import { binder } from "@scm-manager/ui-extensions";
 import ProtocolInformation from "./ProtocolInformation";
 import HgAvatar from "./HgAvatar";
+import { ConfigurationBinder as cfgBinder } from "@scm-manager/ui-components";
+import HgGlobalConfiguration from "./HgGlobalConfiguration";
 
 const hgPredicate = (props: Object) => {
   return props.repository && props.repository.type === "hg";
@@ -9,3 +11,7 @@ const hgPredicate = (props: Object) => {
 
 binder.bind("repos.repository-details.information", ProtocolInformation, hgPredicate);
 binder.bind("repos.repository-avatar", HgAvatar, hgPredicate);
+
+// bind global configuration
+
+cfgBinder.bindGlobal("/hg", "scm-hg-plugin.config.link", "hgConfig", HgGlobalConfiguration);
diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/locales/en/plugins.json b/scm-plugins/scm-hg-plugin/src/main/resources/locales/en/plugins.json
index 4ec1d4e4d2..903f906c7e 100644
--- a/scm-plugins/scm-hg-plugin/src/main/resources/locales/en/plugins.json
+++ b/scm-plugins/scm-hg-plugin/src/main/resources/locales/en/plugins.json
@@ -4,6 +4,27 @@
       "clone" : "Clone the repository",
       "create" : "Create a new repository",
       "replace" : "Push an existing repository"
+    },
+    "config": {
+      "link": "Mercurial",
+      "title": "Mercurial Configuration",
+      "hgBinary": "HG Binary",
+      "hgBinaryHelpText": "Location of Mercurial binary.",
+      "pythonBinary": "Python Binary",
+      "pythonBinaryHelpText": "Location of Python binary.",
+      "pythonPath": "Python Module Search Path",
+      "pythonPathHelpText": "Python Module Search Path (PYTHONPATH).",
+      "repositoryDirectory": "Repository directory",
+      "repositoryDirectoryHelpText": "Location of Mercurial repositories.",
+      "encoding": "Encoding",
+      "encodingHelpText": "Repository Encoding.",
+      "useOptimizedBytecode": "Optimized Bytecode (.pyo)",
+      "useOptimizedBytecodeHelpText": "Use the Python '-O' switch.",
+      "showRevisionInId": "Show Revision",
+      "showRevisionInIdHelpText": "Show revision as part of the node id.",
+      "disabled": "Disabled",
+      "disabledHelpText": "Enable or disable the Mercurial plugin.",
+      "required": "This configuration value is required"
     }
   }
 }

From da9db10701cb0d8e9747c25e67dfd61ae8a518a9 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 6 Nov 2018 16:39:28 +0100
Subject: [PATCH 122/188] implemented global configuration for subversion

---
 .../src/main/js/SvnConfigurationForm.js       | 107 ++++++++++++++++++
 .../src/main/js/SvnGlobalConfiguration.js     |  28 +++++
 .../scm-svn-plugin/src/main/js/index.js       |   6 +
 .../main/resources/locales/en/plugins.json    |  21 ++++
 4 files changed, 162 insertions(+)
 create mode 100644 scm-plugins/scm-svn-plugin/src/main/js/SvnConfigurationForm.js
 create mode 100644 scm-plugins/scm-svn-plugin/src/main/js/SvnGlobalConfiguration.js

diff --git a/scm-plugins/scm-svn-plugin/src/main/js/SvnConfigurationForm.js b/scm-plugins/scm-svn-plugin/src/main/js/SvnConfigurationForm.js
new file mode 100644
index 0000000000..9470550ef2
--- /dev/null
+++ b/scm-plugins/scm-svn-plugin/src/main/js/SvnConfigurationForm.js
@@ -0,0 +1,107 @@
+//@flow
+import React from "react";
+import type { Links } from "@scm-manager/ui-types";
+import { translate } from "react-i18next";
+import { InputField, Checkbox, Select } from "@scm-manager/ui-components";
+
+type Configuration = {
+  repositoryDirectory: string,
+  compatibility: string,
+  enabledGZip: boolean,
+  disabled: boolean,
+  _links: Links
+};
+
+type Props = {
+  initialConfiguration: Configuration,
+  readOnly: boolean,
+
+  onConfigurationChange: (Configuration, boolean) => void,
+
+  // context props
+  t: (string) => string
+}
+
+type State = Configuration;
+
+class HgConfigurationForm extends React.Component<Props, State> {
+
+  constructor(props: Props) {
+    super(props);
+    this.state = { ...props.initialConfiguration, validationErrors: [] };
+  }
+
+  isValid = () => {
+    return !!this.state.repositoryDirectory;
+  };
+
+  handleChange = (value: any, name: string) => {
+    this.setState({
+      [name]: value
+    }, () => this.props.onConfigurationChange(this.state, this.isValid()));
+  };
+
+  compatibilityOptions = (values: string[]) => {
+    const options = [];
+    for (let value of values) {
+      options.push( this.compatibilityOption(value) );
+    }
+    return options;
+  };
+
+  compatibilityOption = (value: string) => {
+    return {
+      value,
+      label: this.props.t("scm-svn-plugin.config.compatibility-values." + value.toLowerCase())
+    };
+  };
+
+  render() {
+    const { readOnly, t } = this.props;
+    const compatibilityOptions = this.compatibilityOptions([
+      "NONE", "PRE14", "PRE15", "PRE16", "PRE17", "WITH17"
+    ]);
+
+    return (
+      <>
+        <InputField
+          name="repositoryDirectory"
+          label={t("scm-svn-plugin.config.directory")}
+          helpText={t("scm-svn-plugin.config.directoryHelpText")}
+          value={this.state.repositoryDirectory}
+          errorMessage={t("scm-svn-plugin.config.required")}
+          validationError={!this.state.repositoryDirectory}
+          onChange={this.handleChange}
+          disabled={readOnly}
+        />
+        <Select
+          name="compatibility"
+          label={t("scm-svn-plugin.config.compatibility")}
+          helpText={t("scm-svn-plugin.config.compatibilityHelpText")}
+          value={this.state.compatibility}
+          options={compatibilityOptions}
+          onChange={this.handleChange}
+        />
+        <Checkbox
+          name="enabledGZip"
+          label={t("scm-svn-plugin.config.enabledGZip")}
+          helpText={t("scm-svn-plugin.config.enabledGZipHelpText")}
+          checked={this.state.enabledGZip}
+          onChange={this.handleChange}
+          disabled={readOnly}
+        />
+        <Checkbox
+          name="disabled"
+          label={t("scm-svn-plugin.config.disabled")}
+          helpText={t("scm-svn-plugin.config.disabledHelpText")}
+          checked={this.state.disabled}
+          onChange={this.handleChange}
+          disabled={readOnly}
+        />
+      </>
+    );
+  }
+
+}
+
+export default translate("plugins")(HgConfigurationForm);
diff --git a/scm-plugins/scm-svn-plugin/src/main/js/SvnGlobalConfiguration.js b/scm-plugins/scm-svn-plugin/src/main/js/SvnGlobalConfiguration.js
new file mode 100644
index 0000000000..c17829a67f
--- /dev/null
+++ b/scm-plugins/scm-svn-plugin/src/main/js/SvnGlobalConfiguration.js
@@ -0,0 +1,28 @@
+//@flow
+import React from "react";
+import { translate } from "react-i18next";
+import { Title, GlobalConfiguration } from "@scm-manager/ui-components";
+import SvnConfigurationForm from "./SvnConfigurationForm";
+
+type Props = {
+  link: string,
+
+  // context props
+  t: (string) => string
+}
+
+class SvnGlobalConfiguration extends React.Component<Props> {
+
+  render() {
+    const  { link, t } = this.props;
+    return (
+      <div>
+        <Title title={t("scm-svn-plugin.config.title")}/>
+        <GlobalConfiguration link={link} render={props => <SvnConfigurationForm {...props} />}/>
+      </div>
+    );
+  }
+
+}
+
+export default translate("plugins")(SvnGlobalConfiguration);
diff --git a/scm-plugins/scm-svn-plugin/src/main/js/index.js b/scm-plugins/scm-svn-plugin/src/main/js/index.js
index 9df7ef1649..dc0c68c395 100644
--- a/scm-plugins/scm-svn-plugin/src/main/js/index.js
+++ b/scm-plugins/scm-svn-plugin/src/main/js/index.js
@@ -1,7 +1,9 @@
 // @flow
 import { binder } from "@scm-manager/ui-extensions";
+import { ConfigurationBinder as cfgBinder } from "@scm-manager/ui-components";
 import ProtocolInformation from "./ProtocolInformation";
 import SvnAvatar from "./SvnAvatar";
+import SvnGlobalConfiguration from "./SvnGlobalConfiguration";
 
 const svnPredicate = (props: Object) => {
   return props.repository && props.repository.type === "svn";
@@ -9,3 +11,7 @@ const svnPredicate = (props: Object) => {
 
 binder.bind("repos.repository-details.information", ProtocolInformation, svnPredicate);
 binder.bind("repos.repository-avatar", SvnAvatar, svnPredicate);
+
+// bind global configuration
+
+cfgBinder.bindGlobal("/svn", "scm-svn-plugin.config.link", "svnConfig", SvnGlobalConfiguration);
diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/locales/en/plugins.json b/scm-plugins/scm-svn-plugin/src/main/resources/locales/en/plugins.json
index 07b34baf10..5181f76941 100644
--- a/scm-plugins/scm-svn-plugin/src/main/resources/locales/en/plugins.json
+++ b/scm-plugins/scm-svn-plugin/src/main/resources/locales/en/plugins.json
@@ -2,6 +2,27 @@
   "scm-svn-plugin": {
     "information": {
       "checkout" : "Checkout repository"
+    },
+    "config": {
+      "link": "Subversion",
+      "title": "Subversion Configuration",
+      "directory": "Repository Directory",
+      "directoryHelpText": "Location of Subversion repositories.",
+      "compatibility": "Version Compatibility",
+      "compatibilityHelpText": "Specifies with which subversion version repositories are compatible.",
+      "compatibility-values": {
+        "none": "No compatibility",
+        "pre14": "Pre 1.4 Compatible",
+        "pre15": "Pre 1.5 Compatible",
+        "pre16": "Pre 1.6 Compatible",
+        "pre17": "Pre 1.7 Compatible",
+        "with17": "With 1.7 Compatible"
+      },
+      "enabledGZip": "Enable GZip Compression",
+      "enabledGZipHelpText": "Enable GZip compression for svn responses.",
+      "disabled": "Disabled",
+      "disabledHelpText": "Enable or disable the Git plugin",
+      "required": "This configuration value is required"
     }
   }
 }

From 6863337faf1e7fe12a69caa181c83064bc40430c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 6 Nov 2018 17:14:27 +0100
Subject: [PATCH 123/188] Implement first steps for merge

---
 .../scm/repository/CloseableWrapper.java      | 25 ++++++++
 .../scm/repository/GitRepositoryHandler.java  |  9 ++-
 .../sonia/scm/repository/GitWorkdirPool.java  | 46 +++++++++++++++
 .../scm/repository/spi/GitMergeCommand.java   | 35 +++++++++++
 .../spi/GitRepositoryServiceProvider.java     |  6 ++
 .../scm/repository/CloseableWrapperTest.java  | 29 +++++++++
 .../scm/repository/GitWorkdirPoolTest.java    | 59 +++++++++++++++++++
 .../spi/AbstractGitCommandTestBase.java       |  4 +-
 8 files changed, 211 insertions(+), 2 deletions(-)
 create mode 100644 scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/CloseableWrapper.java
 create mode 100644 scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkdirPool.java
 create mode 100644 scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
 create mode 100644 scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java
 create mode 100644 scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitWorkdirPoolTest.java

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/CloseableWrapper.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/CloseableWrapper.java
new file mode 100644
index 0000000000..553f0f5a00
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/CloseableWrapper.java
@@ -0,0 +1,25 @@
+package sonia.scm.repository;
+
+import java.util.function.Consumer;
+
+public class CloseableWrapper<C> implements AutoCloseable {
+
+  private final C wrapped;
+  private final Consumer<C> cleanup;
+
+  public CloseableWrapper(C wrapped, Consumer<C> cleanup) {
+    this.wrapped = wrapped;
+    this.cleanup = cleanup;
+  }
+
+  public C get() { return wrapped; }
+
+  @Override
+  public void close() {
+    try {
+      cleanup.accept(wrapped);
+    } catch (Throwable t) {
+      throw new RuntimeException(t);
+    }
+  }
+}
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
index c3436c2395..00add44466 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
@@ -90,6 +90,8 @@ public class GitRepositoryHandler
   private static final Object LOCK = new Object();
   
   private final Scheduler scheduler;
+
+  private final GitWorkdirPool workdirPool;
   
   private Task task;
   
@@ -104,10 +106,11 @@ public class GitRepositoryHandler
    * @param scheduler
    */
   @Inject
-  public GitRepositoryHandler(ConfigurationStoreFactory storeFactory, FileSystem fileSystem, Scheduler scheduler)
+  public GitRepositoryHandler(ConfigurationStoreFactory storeFactory, FileSystem fileSystem, Scheduler scheduler, GitWorkdirPool workdirPool)
   {
     super(storeFactory, fileSystem);
     this.scheduler = scheduler;
+    this.workdirPool = workdirPool;
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -235,4 +238,8 @@ public class GitRepositoryHandler
   {
     return new File(directory, DIRECTORY_REFS).exists();
   }
+
+  public GitWorkdirPool getWorkdirPool() {
+    return workdirPool;
+  }
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkdirPool.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkdirPool.java
new file mode 100644
index 0000000000..2c94a75be5
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkdirPool.java
@@ -0,0 +1,46 @@
+package sonia.scm.repository;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.Repository;
+
+import java.io.File;
+import java.util.Random;
+
+
+/**
+ * Config:
+ *
+ * 1. Overall and absolute maximum of temp work directories
+ * 2. Maximum number of temp work directories pooled overall
+ * 3. Maximum number of temp work directories pooled for one master repository
+ */
+public class GitWorkdirPool {
+
+  private final Random random = new Random();
+  private final File poolDirectory;
+
+  public GitWorkdirPool() {
+    this(new File(System.getProperty("java.io.tmpdir")));
+  }
+
+  public GitWorkdirPool(File poolDirectory) {
+    this.poolDirectory = poolDirectory;
+  }
+
+  public CloseableWrapper<Repository> getWorkingCopy(File bareRepository) {
+    try {
+      Git clone = cloneRepository(bareRepository, new File(poolDirectory, Long.toString(random.nextLong())));
+      return new CloseableWrapper<>(clone.getRepository(), r -> clone.close());
+    } catch (GitAPIException e) {
+      throw new InternalRepositoryException("could not clone working copy of repository", e);
+    }
+  }
+
+  protected Git cloneRepository(File bareRepository, File target) throws GitAPIException {
+    return Git.cloneRepository()
+      .setURI(bareRepository.getAbsolutePath())
+      .setDirectory(target)
+      .call();
+  }
+}
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
new file mode 100644
index 0000000000..b648681f61
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -0,0 +1,35 @@
+package sonia.scm.repository.spi;
+
+import org.eclipse.jgit.merge.MergeStrategy;
+import org.eclipse.jgit.merge.ResolveMerger;
+import sonia.scm.repository.CloseableWrapper;
+import sonia.scm.repository.GitWorkdirPool;
+import sonia.scm.repository.InternalRepositoryException;
+import sonia.scm.repository.Repository;
+
+import java.io.IOException;
+
+public class GitMergeCommand extends AbstractGitCommand implements MergeCommand {
+
+  private final GitWorkdirPool workdirPool;
+
+  GitMergeCommand(GitContext context, Repository repository, GitWorkdirPool workdirPool) {
+    super(context, repository);
+    this.workdirPool = workdirPool;
+  }
+
+  @Override
+  public boolean merge(MergeCommandRequest request) {
+    try (CloseableWrapper<org.eclipse.jgit.lib.Repository> workingCopy = workdirPool.getWorkingCopy(context.open().getDirectory())) {
+      org.eclipse.jgit.lib.Repository repository = workingCopy.get();
+      ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository);
+      boolean mergeResult = merger.merge(repository.resolve(request.getBranchToMerge()), repository.resolve(request.getTargetBranch()));
+      if (mergeResult) {
+        // TODO push and verify push was successful
+      }
+      return mergeResult;
+    } catch (IOException e) {
+      throw new InternalRepositoryException(e);
+    }
+  }
+}
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
index dd6c1b5492..ac5c161dc4 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
@@ -245,6 +245,12 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
   public MergeDryRunCommand getMergeDryRunCommand() {
     return new GitMergeDryRunCommand(context, repository);
   }
+
+  @Override
+  public MergeCommand getMergeCommand() {
+    return new GitMergeCommand(context, repository, handler.getWorkdirPool());
+  }
+
 //~--- fields ---------------------------------------------------------------
 
   /** Field description */
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java
new file mode 100644
index 0000000000..34c5e8e7e2
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java
@@ -0,0 +1,29 @@
+package sonia.scm.repository;
+
+import org.junit.Test;
+
+import java.util.function.Consumer;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+public class CloseableWrapperTest {
+
+  @Test
+  public void x() {
+    Consumer<String> wrapped = new Consumer<String>() {
+      // no this cannot be replaced with a lambda because otherwise we could not use Mockito#spy
+      @Override
+      public void accept(String s) {
+      }
+    };
+
+    Consumer<String> closer = spy(wrapped);
+
+    try (CloseableWrapper<String> wrapper = new CloseableWrapper<>("test", closer)) {
+      // nothing to do here
+    }
+
+    verify(closer).accept("test");
+  }
+}
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitWorkdirPoolTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitWorkdirPoolTest.java
new file mode 100644
index 0000000000..133df75ea7
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitWorkdirPoolTest.java
@@ -0,0 +1,59 @@
+package sonia.scm.repository;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.Repository;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import sonia.scm.repository.spi.AbstractGitCommandTestBase;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+public class GitWorkdirPoolTest extends AbstractGitCommandTestBase {
+
+  @Rule
+  public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+  @Test
+  public void emptyPoolShouldCreateNewWorkdir() throws IOException {
+    GitWorkdirPool pool = new GitWorkdirPool(temporaryFolder.newFolder());
+    File masterRepo = createRepositoryDirectory();
+
+    CloseableWrapper<Repository> workingCopy = pool.getWorkingCopy(masterRepo);
+
+    assertThat(workingCopy)
+      .isNotNull()
+      .extracting(w -> w.get().getDirectory())
+      .isNotEqualTo(masterRepo);
+  }
+
+  @Test
+  public void cloneFromPoolShouldBeClosed() throws IOException {
+    PoolWithSpy pool = new PoolWithSpy(temporaryFolder.newFolder());
+    File masterRepo = createRepositoryDirectory();
+
+    try (CloseableWrapper<Repository> workingCopy = pool.getWorkingCopy(masterRepo)) {
+      assertThat(workingCopy).isNotNull();
+    }
+    verify(pool.createdClone).close();
+  }
+
+  private static class PoolWithSpy extends GitWorkdirPool {
+    PoolWithSpy(File poolDirectory) {
+      super(poolDirectory);
+    }
+
+    Git createdClone;
+    @Override
+    protected Git cloneRepository(File bareRepository, File destination) throws GitAPIException {
+      createdClone = spy(super.cloneRepository(bareRepository, destination));
+      return createdClone;
+    }
+  }
+}
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java
index 496b71e656..7d56db00d7 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java
@@ -50,7 +50,9 @@ public class AbstractGitCommandTestBase extends ZippedRepositoryTestBase
   @After
   public void close()
   {
-    context.close();
+    if (context != null) {
+      context.close();
+    }
   }
 
   /**

From 23783d43f689b214832b7ff2b81fc7baaaf7ec3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 08:19:38 +0100
Subject: [PATCH 124/188] Fix build breaker

---
 .../sonia/scm/repository/GitRepositoryHandlerTest.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
index a9969f27f8..26c449835b 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
@@ -61,6 +61,9 @@ public class GitRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
   @Mock
   private ConfigurationStoreFactory factory;
 
+  @Mock
+  private GitWorkdirPool gitWorkdirPool;
+
   @Override
   protected void checkDirectory(File directory) {
     File head = new File(directory, "HEAD");
@@ -84,7 +87,7 @@ public class GitRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
   protected RepositoryHandler createRepositoryHandler(ConfigurationStoreFactory factory,
                                                       File directory) {
     GitRepositoryHandler repositoryHandler = new GitRepositoryHandler(factory,
-      new DefaultFileSystem(), scheduler);
+      new DefaultFileSystem(), scheduler, gitWorkdirPool);
 
     repositoryHandler.init(contextProvider);
 
@@ -100,7 +103,7 @@ public class GitRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
   @Test
   public void getDirectory() {
     GitRepositoryHandler repositoryHandler = new GitRepositoryHandler(factory,
-      new DefaultFileSystem(), scheduler);
+      new DefaultFileSystem(), scheduler, gitWorkdirPool);
 
     GitConfig gitConfig = new GitConfig();
     gitConfig.setRepositoryDirectory(new File("/path"));

From fc3e08d61272b634fdda19fe32a9af1dfff3b741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 08:32:27 +0100
Subject: [PATCH 125/188] Include dry run in merge command

---
 .../repository/api/MergeCommandBuilder.java   |  7 +-
 .../repository/api/MergeCommandResult.java    | 13 ++++
 .../api/MergeDryRunCommandBuilder.java        | 35 ----------
 .../api/MergeDryRunCommandResult.java         | 14 ++++
 .../scm/repository/spi/MergeCommand.java      |  7 +-
 .../repository/spi/MergeDryRunCommand.java    |  5 --
 .../spi/MergeDryRunCommandRequest.java        | 70 -------------------
 .../scm/repository/spi/GitMergeCommand.java   | 17 ++++-
 .../repository/spi/GitMergeDryRunCommand.java | 25 -------
 .../spi/GitRepositoryServiceProvider.java     |  5 --
 .../repository/spi/GitMergeCommandTest.java   | 22 ++++++
 .../spi/GitMergeDryRunCommandTest.java        | 23 ------
 12 files changed, 76 insertions(+), 167 deletions(-)
 create mode 100644 scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java
 delete mode 100644 scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandBuilder.java
 create mode 100644 scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandResult.java
 delete mode 100644 scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommand.java
 delete mode 100644 scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommandRequest.java
 delete mode 100644 scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeDryRunCommand.java
 create mode 100644 scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
 delete mode 100644 scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeDryRunCommandTest.java

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
index 6d9b332f0a..65eed2f2a1 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
@@ -28,8 +28,13 @@ public class MergeCommandBuilder {
     return this;
   }
 
-  public boolean execute() {
+  public MergeCommandResult executeMerge() {
     Preconditions.checkArgument(request.isValid(), "revision to merge and target revision is required");
     return mergeCommand.merge(request);
   }
+
+  public MergeDryRunCommandResult dryRun() {
+    Preconditions.checkArgument(request.isValid(), "revision to merge and target revision is required");
+    return mergeCommand.dryRun(request);
+  }
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java
new file mode 100644
index 0000000000..024e7bbc89
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java
@@ -0,0 +1,13 @@
+package sonia.scm.repository.api;
+
+public class MergeCommandResult {
+  private final boolean success;
+
+  public MergeCommandResult(boolean success) {
+    this.success = success;
+  }
+
+  public boolean isSuccess() {
+    return success;
+  }
+}
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandBuilder.java
deleted file mode 100644
index 852ffdcfbd..0000000000
--- a/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandBuilder.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package sonia.scm.repository.api;
-
-import com.google.common.base.Preconditions;
-import sonia.scm.repository.spi.MergeCommand;
-import sonia.scm.repository.spi.MergeCommandRequest;
-
-public class MergeDryRunCommandBuilder {
-
-  private final MergeCommand mergeCommand;
-  private final MergeCommandRequest request = new MergeCommandRequest();
-
-  public MergeDryRunCommandBuilder(MergeCommand mergeCommand) {
-    this.mergeCommand = mergeCommand;
-  }
-
-  public MergeDryRunCommandBuilder setBranchToMerge(String branchToMerge) {
-    request.setBranchToMerge(branchToMerge);
-    return this;
-  }
-
-  public MergeDryRunCommandBuilder setTargetBranch(String targetBranch) {
-    request.setTargetBranch(targetBranch);
-    return this;
-  }
-
-  public MergeDryRunCommandBuilder reset() {
-    request.reset();
-    return this;
-  }
-
-  public boolean execute() {
-    Preconditions.checkArgument(request.isValid(), "revision to merge and target revision is required");
-    return mergeCommand.merge(request);
-  }
-}
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandResult.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandResult.java
new file mode 100644
index 0000000000..aeb18a753d
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandResult.java
@@ -0,0 +1,14 @@
+package sonia.scm.repository.api;
+
+public class MergeDryRunCommandResult {
+
+  private final boolean mergeable;
+
+  public MergeDryRunCommandResult(boolean mergeable) {
+    this.mergeable = mergeable;
+  }
+
+  public boolean isMergeable() {
+    return mergeable;
+  }
+}
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommand.java b/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommand.java
index 326bba4dce..0a3680f6b3 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommand.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommand.java
@@ -1,5 +1,10 @@
 package sonia.scm.repository.spi;
 
+import sonia.scm.repository.api.MergeCommandResult;
+import sonia.scm.repository.api.MergeDryRunCommandResult;
+
 public interface MergeCommand {
-  boolean merge(MergeCommandRequest request);
+  MergeCommandResult merge(MergeCommandRequest request);
+
+  MergeDryRunCommandResult dryRun(MergeCommandRequest request);
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommand.java b/scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommand.java
deleted file mode 100644
index af4fbe06bd..0000000000
--- a/scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommand.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package sonia.scm.repository.spi;
-
-public interface MergeDryRunCommand {
-  boolean isMergeable(MergeDryRunCommandRequest request);
-}
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommandRequest.java b/scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommandRequest.java
deleted file mode 100644
index b0cd737bd1..0000000000
--- a/scm-core/src/main/java/sonia/scm/repository/spi/MergeDryRunCommandRequest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package sonia.scm.repository.spi;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.base.Strings;
-import sonia.scm.Validateable;
-
-import java.io.Serializable;
-
-public class MergeDryRunCommandRequest implements Validateable, Resetable, Serializable, Cloneable {
-
-  private static final long serialVersionUID = -2650236557922431528L;
-
-  private String branchToMerge;
-  private String targetBranch;
-
-  public String getBranchToMerge() {
-    return branchToMerge;
-  }
-
-  public void setBranchToMerge(String branchToMerge) {
-    this.branchToMerge = branchToMerge;
-  }
-
-  public String getTargetBranch() {
-    return targetBranch;
-  }
-
-  public void setTargetBranch(String targetBranch) {
-    this.targetBranch = targetBranch;
-  }
-
-  public boolean isValid() {
-    return !Strings.isNullOrEmpty(getBranchToMerge()) && !Strings.isNullOrEmpty(getTargetBranch());
-  }
-
-  public void reset() {
-    this.setBranchToMerge(null);
-    this.setTargetBranch(null);
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (obj == null) {
-      return false;
-    }
-
-    if (getClass() != obj.getClass()) {
-      return false;
-    }
-
-    final MergeDryRunCommandRequest other = (MergeDryRunCommandRequest) obj;
-
-    return Objects.equal(branchToMerge, other.branchToMerge)
-      && Objects.equal(targetBranch, other.targetBranch);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hashCode(branchToMerge, targetBranch);
-  }
-
-  @Override
-  public String toString() {
-    return MoreObjects.toStringHelper(this)
-      .add("branchToMerge", branchToMerge)
-      .add("targetBranch", targetBranch)
-      .toString();
-  }
-}
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index b648681f61..ba1cc0e496 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -6,6 +6,8 @@ import sonia.scm.repository.CloseableWrapper;
 import sonia.scm.repository.GitWorkdirPool;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Repository;
+import sonia.scm.repository.api.MergeCommandResult;
+import sonia.scm.repository.api.MergeDryRunCommandResult;
 
 import java.io.IOException;
 
@@ -19,7 +21,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
   }
 
   @Override
-  public boolean merge(MergeCommandRequest request) {
+  public MergeCommandResult merge(MergeCommandRequest request) {
     try (CloseableWrapper<org.eclipse.jgit.lib.Repository> workingCopy = workdirPool.getWorkingCopy(context.open().getDirectory())) {
       org.eclipse.jgit.lib.Repository repository = workingCopy.get();
       ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository);
@@ -27,7 +29,18 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       if (mergeResult) {
         // TODO push and verify push was successful
       }
-      return mergeResult;
+      return new MergeCommandResult(mergeResult);
+    } catch (IOException e) {
+      throw new InternalRepositoryException(e);
+    }
+  }
+
+  @Override
+  public MergeDryRunCommandResult dryRun(MergeCommandRequest request) {
+    try {
+      org.eclipse.jgit.lib.Repository repository = context.open();
+      ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
+      return new MergeDryRunCommandResult(merger.merge(repository.resolve(request.getBranchToMerge()), repository.resolve(request.getTargetBranch())));
     } catch (IOException e) {
       throw new InternalRepositoryException(e);
     }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeDryRunCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeDryRunCommand.java
deleted file mode 100644
index e49c520457..0000000000
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeDryRunCommand.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package sonia.scm.repository.spi;
-
-import org.eclipse.jgit.merge.MergeStrategy;
-import org.eclipse.jgit.merge.ResolveMerger;
-import sonia.scm.repository.InternalRepositoryException;
-import sonia.scm.repository.Repository;
-
-import java.io.IOException;
-
-public class GitMergeDryRunCommand extends AbstractGitCommand implements MergeDryRunCommand {
-  GitMergeDryRunCommand(GitContext context, Repository repository) {
-    super(context, repository);
-  }
-
-  @Override
-  public boolean isMergeable(MergeDryRunCommandRequest request) {
-    try {
-      org.eclipse.jgit.lib.Repository repository = context.open();
-      ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
-      return merger.merge(repository.resolve(request.getBranchToMerge()), repository.resolve(request.getTargetBranch()));
-    } catch (IOException e) {
-      throw new InternalRepositoryException(e);
-    }
-  }
-}
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
index ac5c161dc4..c29da1029f 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
@@ -241,11 +241,6 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
     return new GitTagsCommand(context, repository);
   }
 
-  @Override
-  public MergeDryRunCommand getMergeDryRunCommand() {
-    return new GitMergeDryRunCommand(context, repository);
-  }
-
   @Override
   public MergeCommand getMergeCommand() {
     return new GitMergeCommand(context, repository, handler.getWorkdirPool());
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
new file mode 100644
index 0000000000..3c58916807
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
@@ -0,0 +1,22 @@
+package sonia.scm.repository.spi;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class GitMergeCommandTest extends AbstractGitCommandTestBase {
+  @Test
+  public void shouldDetectNotMergeableBranches() {
+    GitMergeCommand command = createCommand();
+    MergeCommandRequest request = new MergeCommandRequest();
+    request.setBranchToMerge("test-branch");
+    request.setTargetBranch("master");
+
+    boolean mergeable = command.dryRun(request).isMergeable();
+
+    Assert.assertFalse(mergeable);
+  }
+
+  private GitMergeCommand createCommand() {
+    return new GitMergeCommand(createContext(), repository, null);
+  }
+}
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeDryRunCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeDryRunCommandTest.java
deleted file mode 100644
index 891b8537dd..0000000000
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeDryRunCommandTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package sonia.scm.repository.spi;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class GitMergeDryRunCommandTest extends AbstractGitCommandTestBase {
-  @Test
-  public void shouldDetectNotMergeableBranches() {
-    GitMergeDryRunCommand command = createCommand();
-    MergeDryRunCommandRequest request = new MergeDryRunCommandRequest();
-    request.setBranchToMerge("test-branch");
-    request.setTargetBranch("master");
-
-    boolean mergeable = command.isMergeable(request);
-
-    Assert.assertFalse(mergeable);
-  }
-
-  private GitMergeDryRunCommand createCommand()
-  {
-    return new GitMergeDryRunCommand(createContext(), repository);
-  }
-}

From 4cdf3e468cf040727bc7a6df795f8f682287df2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 08:38:26 +0100
Subject: [PATCH 126/188] Add merge command to repository service api

---
 .../scm/repository/api/RepositoryService.java   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java
index bdd6e4b320..fe0529e6b5 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java
@@ -79,6 +79,7 @@ import java.util.stream.Stream;
  * @apiviz.uses sonia.scm.repository.api.PushCommandBuilder
  * @apiviz.uses sonia.scm.repository.api.BundleCommandBuilder
  * @apiviz.uses sonia.scm.repository.api.UnbundleCommandBuilder
+ * @apiviz.uses sonia.scm.repository.api.MergeCommandBuilder
  * @since 1.17
  */
 @Slf4j
@@ -353,6 +354,22 @@ public final class RepositoryService implements Closeable {
       repository);
   }
 
+  /**
+   * The merge command executes a merge of two branches. It is possible to do a dry run to check, whether the given
+   * branches can be merged without conflicts.
+   *
+   * @return instance of {@link MergeCommandBuilder}
+   * @throws CommandNotSupportedException if the command is not supported
+   *                                      by the implementation of the repository service provider.
+   * @since 2.0.0
+   */
+  public MergeCommandBuilder gerMergeCommand() {
+    logger.debug("create unbundle command for repository {}",
+      repository.getNamespaceAndName());
+
+    return new MergeCommandBuilder(provider.getMergeCommand());
+  }
+
   /**
    * Returns true if the command is supported by the repository service.
    *

From b029efb5c9b70f3d2dacda5ea2c9b0d44c010359 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 7 Nov 2018 09:45:12 +0100
Subject: [PATCH 127/188] update ui-extensions to fix unit tests

---
 scm-plugins/scm-git-plugin/package.json               | 2 +-
 scm-plugins/scm-git-plugin/yarn.lock                  | 6 +++---
 scm-plugins/scm-hg-plugin/package.json                | 2 +-
 scm-plugins/scm-hg-plugin/yarn.lock                   | 6 +++---
 scm-plugins/scm-svn-plugin/package.json               | 2 +-
 scm-plugins/scm-svn-plugin/yarn.lock                  | 6 +++---
 scm-ui-components/packages/ui-components/package.json | 2 +-
 scm-ui-components/packages/ui-components/yarn.lock    | 6 +++---
 scm-ui/package.json                                   | 2 +-
 scm-ui/yarn.lock                                      | 6 +++---
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json
index f295924923..6377574498 100644
--- a/scm-plugins/scm-git-plugin/package.json
+++ b/scm-plugins/scm-git-plugin/package.json
@@ -9,7 +9,7 @@
     "flow": "flow check"
   },
   "dependencies": {
-    "@scm-manager/ui-extensions": "^0.0.7"
+    "@scm-manager/ui-extensions": "^0.1.1"
   },
   "devDependencies": {
     "@scm-manager/ui-bundler": "^0.0.21"
diff --git a/scm-plugins/scm-git-plugin/yarn.lock b/scm-plugins/scm-git-plugin/yarn.lock
index 1313cbc62c..3514ed3f2c 100644
--- a/scm-plugins/scm-git-plugin/yarn.lock
+++ b/scm-plugins/scm-git-plugin/yarn.lock
@@ -747,9 +747,9 @@
     vinyl-source-stream "^2.0.0"
     watchify "^3.11.0"
 
-"@scm-manager/ui-extensions@^0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.0.7.tgz#a0a657a1410b78838ba0b36096ef631dca7fe27e"
+"@scm-manager/ui-extensions@^0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45"
   dependencies:
     react "^16.4.2"
     react-dom "^16.4.2"
diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json
index 0b18c7028d..dbca702070 100644
--- a/scm-plugins/scm-hg-plugin/package.json
+++ b/scm-plugins/scm-hg-plugin/package.json
@@ -6,7 +6,7 @@
     "build": "ui-bundler plugin"
   },
   "dependencies": {
-    "@scm-manager/ui-extensions": "^0.0.7"
+    "@scm-manager/ui-extensions": "^0.1.1"
   },
   "devDependencies": {
     "@scm-manager/ui-bundler": "^0.0.21"
diff --git a/scm-plugins/scm-hg-plugin/yarn.lock b/scm-plugins/scm-hg-plugin/yarn.lock
index 690432612c..a211aa0ca1 100644
--- a/scm-plugins/scm-hg-plugin/yarn.lock
+++ b/scm-plugins/scm-hg-plugin/yarn.lock
@@ -681,9 +681,9 @@
     vinyl-source-stream "^2.0.0"
     watchify "^3.11.0"
 
-"@scm-manager/ui-extensions@^0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.0.7.tgz#a0a657a1410b78838ba0b36096ef631dca7fe27e"
+"@scm-manager/ui-extensions@^0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45"
   dependencies:
     react "^16.4.2"
     react-dom "^16.4.2"
diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json
index 732e244113..41f1c88a18 100644
--- a/scm-plugins/scm-svn-plugin/package.json
+++ b/scm-plugins/scm-svn-plugin/package.json
@@ -6,7 +6,7 @@
     "build": "ui-bundler plugin"
   },
   "dependencies": {
-    "@scm-manager/ui-extensions": "^0.0.7"
+    "@scm-manager/ui-extensions": "^0.1.1"
   },
   "devDependencies": {
     "@scm-manager/ui-bundler": "^0.0.21"
diff --git a/scm-plugins/scm-svn-plugin/yarn.lock b/scm-plugins/scm-svn-plugin/yarn.lock
index 690432612c..a211aa0ca1 100644
--- a/scm-plugins/scm-svn-plugin/yarn.lock
+++ b/scm-plugins/scm-svn-plugin/yarn.lock
@@ -681,9 +681,9 @@
     vinyl-source-stream "^2.0.0"
     watchify "^3.11.0"
 
-"@scm-manager/ui-extensions@^0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.0.7.tgz#a0a657a1410b78838ba0b36096ef631dca7fe27e"
+"@scm-manager/ui-extensions@^0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45"
   dependencies:
     react "^16.4.2"
     react-dom "^16.4.2"
diff --git a/scm-ui-components/packages/ui-components/package.json b/scm-ui-components/packages/ui-components/package.json
index 48cf089aba..e176a3d46d 100644
--- a/scm-ui-components/packages/ui-components/package.json
+++ b/scm-ui-components/packages/ui-components/package.json
@@ -25,7 +25,7 @@
     "react-router-enzyme-context": "^1.2.0"
   },
   "dependencies": {
-    "@scm-manager/ui-extensions": "^0.0.7",
+    "@scm-manager/ui-extensions": "^0.1.1",
     "@scm-manager/ui-types": "0.0.1",
     "classnames": "^2.2.6",
     "moment": "^2.22.2",
diff --git a/scm-ui-components/packages/ui-components/yarn.lock b/scm-ui-components/packages/ui-components/yarn.lock
index 886ee3f0fd..f11cfa5bcd 100644
--- a/scm-ui-components/packages/ui-components/yarn.lock
+++ b/scm-ui-components/packages/ui-components/yarn.lock
@@ -681,9 +681,9 @@
     vinyl-source-stream "^2.0.0"
     watchify "^3.11.0"
 
-"@scm-manager/ui-extensions@^0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.0.7.tgz#a0a657a1410b78838ba0b36096ef631dca7fe27e"
+"@scm-manager/ui-extensions@^0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45"
   dependencies:
     react "^16.4.2"
     react-dom "^16.4.2"
diff --git a/scm-ui/package.json b/scm-ui/package.json
index 219e173ca6..c4b7cb3983 100644
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -6,7 +6,7 @@
   "main": "src/index.js",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.3.1",
-    "@scm-manager/ui-extensions": "^0.0.7",
+    "@scm-manager/ui-extensions": "^0.1.1",
     "bulma": "^0.7.1",
     "bulma-tooltip": "^2.0.2",
     "classnames": "^2.2.5",
diff --git a/scm-ui/yarn.lock b/scm-ui/yarn.lock
index bf2d8c6a1d..ec5a53aecc 100644
--- a/scm-ui/yarn.lock
+++ b/scm-ui/yarn.lock
@@ -685,9 +685,9 @@
     vinyl-source-stream "^2.0.0"
     watchify "^3.11.0"
 
-"@scm-manager/ui-extensions@^0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.0.7.tgz#a0a657a1410b78838ba0b36096ef631dca7fe27e"
+"@scm-manager/ui-extensions@^0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45"
   dependencies:
     react "^16.4.2"
     react-dom "^16.4.2"

From 33642352ead7c1ac5d840700244bbfd782d42180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 10:28:27 +0100
Subject: [PATCH 128/188] Start with a simple factory instead of a complex pool

---
 .../scm/repository/GitRepositoryHandler.java  | 10 +--
 .../scm/repository/GitWorkdirFactory.java     |  8 ++
 .../sonia/scm/repository/GitWorkdirPool.java  | 46 ----------
 .../sonia/scm/repository/spi/GitContext.java  |  4 +
 .../scm/repository/spi/GitMergeCommand.java   | 15 ++--
 .../spi/GitRepositoryServiceProvider.java     |  2 +-
 .../spi/SimpleGitWorkdirFactory.java          | 56 ++++++++++++
 .../sonia/scm/repository/spi/WorkingCopy.java | 12 +++
 .../repository/GitRepositoryHandlerTest.java  |  6 +-
 .../scm/repository/GitWorkdirPoolTest.java    | 59 -------------
 .../spi/SimpleGitWorkdirFactoryTest.java      | 87 +++++++++++++++++++
 11 files changed, 183 insertions(+), 122 deletions(-)
 create mode 100644 scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkdirFactory.java
 delete mode 100644 scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkdirPool.java
 create mode 100644 scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
 create mode 100644 scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/WorkingCopy.java
 delete mode 100644 scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitWorkdirPoolTest.java
 create mode 100644 scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkdirFactoryTest.java

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
index 00add44466..faf2b23a27 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
@@ -91,7 +91,7 @@ public class GitRepositoryHandler
   
   private final Scheduler scheduler;
 
-  private final GitWorkdirPool workdirPool;
+  private final GitWorkdirFactory workdirFactory;
   
   private Task task;
   
@@ -106,11 +106,11 @@ public class GitRepositoryHandler
    * @param scheduler
    */
   @Inject
-  public GitRepositoryHandler(ConfigurationStoreFactory storeFactory, FileSystem fileSystem, Scheduler scheduler, GitWorkdirPool workdirPool)
+  public GitRepositoryHandler(ConfigurationStoreFactory storeFactory, FileSystem fileSystem, Scheduler scheduler, GitWorkdirFactory workdirFactory)
   {
     super(storeFactory, fileSystem);
     this.scheduler = scheduler;
-    this.workdirPool = workdirPool;
+    this.workdirFactory = workdirFactory;
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -239,7 +239,7 @@ public class GitRepositoryHandler
     return new File(directory, DIRECTORY_REFS).exists();
   }
 
-  public GitWorkdirPool getWorkdirPool() {
-    return workdirPool;
+  public GitWorkdirFactory getWorkdirFactory() {
+    return workdirFactory;
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkdirFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkdirFactory.java
new file mode 100644
index 0000000000..f93713a221
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkdirFactory.java
@@ -0,0 +1,8 @@
+package sonia.scm.repository;
+
+import sonia.scm.repository.spi.GitContext;
+import sonia.scm.repository.spi.WorkingCopy;
+
+public interface GitWorkdirFactory {
+  WorkingCopy createWorkingCopy(GitContext gitContext);
+}
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkdirPool.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkdirPool.java
deleted file mode 100644
index 2c94a75be5..0000000000
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkdirPool.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package sonia.scm.repository;
-
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.lib.Repository;
-
-import java.io.File;
-import java.util.Random;
-
-
-/**
- * Config:
- *
- * 1. Overall and absolute maximum of temp work directories
- * 2. Maximum number of temp work directories pooled overall
- * 3. Maximum number of temp work directories pooled for one master repository
- */
-public class GitWorkdirPool {
-
-  private final Random random = new Random();
-  private final File poolDirectory;
-
-  public GitWorkdirPool() {
-    this(new File(System.getProperty("java.io.tmpdir")));
-  }
-
-  public GitWorkdirPool(File poolDirectory) {
-    this.poolDirectory = poolDirectory;
-  }
-
-  public CloseableWrapper<Repository> getWorkingCopy(File bareRepository) {
-    try {
-      Git clone = cloneRepository(bareRepository, new File(poolDirectory, Long.toString(random.nextLong())));
-      return new CloseableWrapper<>(clone.getRepository(), r -> clone.close());
-    } catch (GitAPIException e) {
-      throw new InternalRepositoryException("could not clone working copy of repository", e);
-    }
-  }
-
-  protected Git cloneRepository(File bareRepository, File target) throws GitAPIException {
-    return Git.cloneRepository()
-      .setURI(bareRepository.getAbsolutePath())
-      .setDirectory(target)
-      .call();
-  }
-}
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitContext.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitContext.java
index 2175846d5a..a10e16e200 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitContext.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitContext.java
@@ -106,6 +106,10 @@ public class GitContext implements Closeable
     return repository;
   }
 
+  File getDirectory() {
+    return directory;
+  }
+
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index ba1cc0e496..6e69a2c5ba 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -2,10 +2,9 @@ package sonia.scm.repository.spi;
 
 import org.eclipse.jgit.merge.MergeStrategy;
 import org.eclipse.jgit.merge.ResolveMerger;
-import sonia.scm.repository.CloseableWrapper;
-import sonia.scm.repository.GitWorkdirPool;
+import org.eclipse.jgit.lib.Repository;
+import sonia.scm.repository.GitWorkdirFactory;
 import sonia.scm.repository.InternalRepositoryException;
-import sonia.scm.repository.Repository;
 import sonia.scm.repository.api.MergeCommandResult;
 import sonia.scm.repository.api.MergeDryRunCommandResult;
 
@@ -13,17 +12,17 @@ import java.io.IOException;
 
 public class GitMergeCommand extends AbstractGitCommand implements MergeCommand {
 
-  private final GitWorkdirPool workdirPool;
+  private final GitWorkdirFactory workdirPool;
 
-  GitMergeCommand(GitContext context, Repository repository, GitWorkdirPool workdirPool) {
+  GitMergeCommand(GitContext context, sonia.scm.repository.Repository repository, GitWorkdirFactory workdirPool) {
     super(context, repository);
     this.workdirPool = workdirPool;
   }
 
   @Override
   public MergeCommandResult merge(MergeCommandRequest request) {
-    try (CloseableWrapper<org.eclipse.jgit.lib.Repository> workingCopy = workdirPool.getWorkingCopy(context.open().getDirectory())) {
-      org.eclipse.jgit.lib.Repository repository = workingCopy.get();
+    try (WorkingCopy workingCopy = workdirPool.createWorkingCopy(context)) {
+      Repository repository = workingCopy.get();
       ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository);
       boolean mergeResult = merger.merge(repository.resolve(request.getBranchToMerge()), repository.resolve(request.getTargetBranch()));
       if (mergeResult) {
@@ -38,7 +37,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
   @Override
   public MergeDryRunCommandResult dryRun(MergeCommandRequest request) {
     try {
-      org.eclipse.jgit.lib.Repository repository = context.open();
+      Repository repository = context.open();
       ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
       return new MergeDryRunCommandResult(merger.merge(repository.resolve(request.getBranchToMerge()), repository.resolve(request.getTargetBranch())));
     } catch (IOException e) {
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
index c29da1029f..846c127c4c 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
@@ -243,7 +243,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
 
   @Override
   public MergeCommand getMergeCommand() {
-    return new GitMergeCommand(context, repository, handler.getWorkdirPool());
+    return new GitMergeCommand(context, repository, handler.getWorkdirFactory());
   }
 
 //~--- fields ---------------------------------------------------------------
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
new file mode 100644
index 0000000000..c69acf5c6e
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
@@ -0,0 +1,56 @@
+package sonia.scm.repository.spi;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.util.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sonia.scm.repository.GitWorkdirFactory;
+import sonia.scm.repository.InternalRepositoryException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Random;
+
+public class SimpleGitWorkdirFactory implements GitWorkdirFactory {
+
+  private static final Logger logger = LoggerFactory.getLogger(SimpleGitWorkdirFactory.class);
+
+  private final Random random = new Random();
+  private final File poolDirectory;
+
+  public SimpleGitWorkdirFactory() {
+    this(new File(System.getProperty("java.io.tmpdir"), "scmm-git-pool"));
+  }
+
+  public SimpleGitWorkdirFactory(File poolDirectory) {
+    this.poolDirectory = poolDirectory;
+  }
+
+  public WorkingCopy createWorkingCopy(GitContext gitContext) {
+    try {
+      Repository clone = cloneRepository(gitContext.getDirectory(), new File(poolDirectory, Long.toString(random.nextLong())));
+      return new WorkingCopy(clone, this::close);
+    } catch (GitAPIException e) {
+      throw new InternalRepositoryException("could not clone working copy of repository", e);
+    }
+  }
+
+  protected Repository cloneRepository(File bareRepository, File target) throws GitAPIException {
+    return Git.cloneRepository()
+      .setURI(bareRepository.getAbsolutePath())
+      .setDirectory(target)
+      .call()
+      .getRepository();
+  }
+
+  private void close(Repository repository) {
+    repository.close();
+    try {
+      FileUtils.delete(repository.getDirectory(), FileUtils.RECURSIVE);
+    } catch (IOException e) {
+      logger.warn("could not delete temporary git workdir '{}'", repository.getDirectory(), e);
+    }
+  }
+}
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/WorkingCopy.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/WorkingCopy.java
new file mode 100644
index 0000000000..fd0cba510b
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/WorkingCopy.java
@@ -0,0 +1,12 @@
+package sonia.scm.repository.spi;
+
+import org.eclipse.jgit.lib.Repository;
+import sonia.scm.repository.CloseableWrapper;
+
+import java.util.function.Consumer;
+
+public class WorkingCopy extends CloseableWrapper<Repository> {
+  WorkingCopy(Repository wrapped, Consumer<Repository> cleanup) {
+    super(wrapped, cleanup);
+  }
+}
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
index 26c449835b..ad731280c5 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
@@ -62,7 +62,7 @@ public class GitRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
   private ConfigurationStoreFactory factory;
 
   @Mock
-  private GitWorkdirPool gitWorkdirPool;
+  private GitWorkdirFactory gitWorkdirFactory;
 
   @Override
   protected void checkDirectory(File directory) {
@@ -87,7 +87,7 @@ public class GitRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
   protected RepositoryHandler createRepositoryHandler(ConfigurationStoreFactory factory,
                                                       File directory) {
     GitRepositoryHandler repositoryHandler = new GitRepositoryHandler(factory,
-      new DefaultFileSystem(), scheduler, gitWorkdirPool);
+      new DefaultFileSystem(), scheduler, gitWorkdirFactory);
 
     repositoryHandler.init(contextProvider);
 
@@ -103,7 +103,7 @@ public class GitRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
   @Test
   public void getDirectory() {
     GitRepositoryHandler repositoryHandler = new GitRepositoryHandler(factory,
-      new DefaultFileSystem(), scheduler, gitWorkdirPool);
+      new DefaultFileSystem(), scheduler, gitWorkdirFactory);
 
     GitConfig gitConfig = new GitConfig();
     gitConfig.setRepositoryDirectory(new File("/path"));
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitWorkdirPoolTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitWorkdirPoolTest.java
deleted file mode 100644
index 133df75ea7..0000000000
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitWorkdirPoolTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package sonia.scm.repository;
-
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.lib.Repository;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import sonia.scm.repository.spi.AbstractGitCommandTestBase;
-
-import java.io.File;
-import java.io.IOException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-public class GitWorkdirPoolTest extends AbstractGitCommandTestBase {
-
-  @Rule
-  public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-  @Test
-  public void emptyPoolShouldCreateNewWorkdir() throws IOException {
-    GitWorkdirPool pool = new GitWorkdirPool(temporaryFolder.newFolder());
-    File masterRepo = createRepositoryDirectory();
-
-    CloseableWrapper<Repository> workingCopy = pool.getWorkingCopy(masterRepo);
-
-    assertThat(workingCopy)
-      .isNotNull()
-      .extracting(w -> w.get().getDirectory())
-      .isNotEqualTo(masterRepo);
-  }
-
-  @Test
-  public void cloneFromPoolShouldBeClosed() throws IOException {
-    PoolWithSpy pool = new PoolWithSpy(temporaryFolder.newFolder());
-    File masterRepo = createRepositoryDirectory();
-
-    try (CloseableWrapper<Repository> workingCopy = pool.getWorkingCopy(masterRepo)) {
-      assertThat(workingCopy).isNotNull();
-    }
-    verify(pool.createdClone).close();
-  }
-
-  private static class PoolWithSpy extends GitWorkdirPool {
-    PoolWithSpy(File poolDirectory) {
-      super(poolDirectory);
-    }
-
-    Git createdClone;
-    @Override
-    protected Git cloneRepository(File bareRepository, File destination) throws GitAPIException {
-      createdClone = spy(super.cloneRepository(bareRepository, destination));
-      return createdClone;
-    }
-  }
-}
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkdirFactoryTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkdirFactoryTest.java
new file mode 100644
index 0000000000..d9c41f85b5
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkdirFactoryTest.java
@@ -0,0 +1,87 @@
+package sonia.scm.repository.spi;
+
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.Repository;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+public class SimpleGitWorkdirFactoryTest extends AbstractGitCommandTestBase {
+
+  @Rule
+  public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+  @Test
+  public void emptyPoolShouldCreateNewWorkdir() throws IOException {
+    SimpleGitWorkdirFactory factory = new SimpleGitWorkdirFactory(temporaryFolder.newFolder());
+    File masterRepo = createRepositoryDirectory();
+
+    try (WorkingCopy workingCopy = factory.createWorkingCopy(createContext())) {
+
+      assertThat(workingCopy.get().getDirectory())
+        .exists()
+        .isNotEqualTo(masterRepo)
+        .isDirectory();
+      assertThat(new File(workingCopy.get().getWorkTree(), "a.txt"))
+        .exists()
+        .isFile()
+        .hasContent("a\nline for blame");
+    }
+  }
+
+  @Test
+  public void cloneFromPoolShouldBeClosed() throws IOException {
+    PoolWithSpy factory = new PoolWithSpy(temporaryFolder.newFolder());
+
+    try (WorkingCopy workingCopy = factory.createWorkingCopy(createContext())) {
+      assertThat(workingCopy).isNotNull();
+    }
+    verify(factory.createdClone).close();
+  }
+
+  @Test
+  public void cloneFromPoolShouldNotBeReused() throws IOException {
+    SimpleGitWorkdirFactory factory = new SimpleGitWorkdirFactory(temporaryFolder.newFolder());
+
+    File firstDirectory;
+    try (WorkingCopy workingCopy = factory.createWorkingCopy(createContext())) {
+      firstDirectory = workingCopy.get().getDirectory();
+    }
+    try (WorkingCopy workingCopy = factory.createWorkingCopy(createContext())) {
+      File secondDirectory = workingCopy.get().getDirectory();
+      assertThat(secondDirectory).isNotEqualTo(firstDirectory);
+    }
+  }
+
+  @Test
+  public void cloneFromPoolShouldBeDeletedOnClose() throws IOException {
+    SimpleGitWorkdirFactory factory = new SimpleGitWorkdirFactory(temporaryFolder.newFolder());
+
+    File directory;
+    try (WorkingCopy workingCopy = factory.createWorkingCopy(createContext())) {
+      directory = workingCopy.get().getDirectory();
+    }
+    assertThat(directory).doesNotExist();
+  }
+
+  private static class PoolWithSpy extends SimpleGitWorkdirFactory {
+    PoolWithSpy(File poolDirectory) {
+      super(poolDirectory);
+    }
+
+    Repository createdClone;
+
+    @Override
+    protected Repository cloneRepository(File bareRepository, File destination) throws GitAPIException {
+      createdClone = spy(super.cloneRepository(bareRepository, destination));
+      return createdClone;
+    }
+  }
+}

From 62c20b071b06254117ad9774129e3639f26a2bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 10:33:47 +0100
Subject: [PATCH 129/188] Fix reminders of dry run

---
 .../src/main/java/sonia/scm/repository/api/Command.java   | 7 +------
 .../scm/repository/spi/RepositoryServiceProvider.java     | 8 --------
 .../scm/repository/spi/GitRepositoryServiceProvider.java  | 2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/Command.java b/scm-core/src/main/java/sonia/scm/repository/api/Command.java
index 2987232ff2..fa09cea2cb 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/Command.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/Command.java
@@ -71,10 +71,5 @@ public enum Command
   /**
    * @since 2.0
    */
-  MERGE,
-
-  /**
-   * @since 2.0
-   */
-  MERGE_DRY_RUN
+  MERGE
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java b/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
index 33dd137302..77201d1a72 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
@@ -259,12 +259,4 @@ public abstract class RepositoryServiceProvider implements Closeable
   {
     throw new CommandNotSupportedException(Command.MERGE);
   }
-
-  /**
-   * @since 2.0
-   */
-  public MergeDryRunCommand getMergeDryRunCommand()
-  {
-    throw new CommandNotSupportedException(Command.MERGE_DRY_RUN);
-  }
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
index 846c127c4c..a0a3074014 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
@@ -64,7 +64,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
     Command.OUTGOING,
     Command.PUSH,
     Command.PULL,
-    Command.MERGE_DRY_RUN
+    Command.MERGE
   );
   //J+
 

From e2766d494a0eea7b32a613613e66aa168430e3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 10:38:01 +0100
Subject: [PATCH 130/188] Register SimpleGitWorkdirFactory in guice context

---
 .../src/main/java/sonia/scm/web/GitServletModule.java         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitServletModule.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitServletModule.java
index e731e01a62..a3dac0e7d1 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitServletModule.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitServletModule.java
@@ -41,6 +41,8 @@ import org.mapstruct.factory.Mappers;
 import sonia.scm.api.v2.resources.GitConfigDtoToGitConfigMapper;
 import sonia.scm.api.v2.resources.GitConfigToGitConfigDtoMapper;
 import sonia.scm.plugin.Extension;
+import sonia.scm.repository.GitWorkdirFactory;
+import sonia.scm.repository.spi.SimpleGitWorkdirFactory;
 import sonia.scm.web.lfs.LfsBlobStoreFactory;
 
 /**
@@ -63,5 +65,7 @@ public class GitServletModule extends ServletModule
 
     bind(GitConfigDtoToGitConfigMapper.class).to(Mappers.getMapper(GitConfigDtoToGitConfigMapper.class).getClass());
     bind(GitConfigToGitConfigDtoMapper.class).to(Mappers.getMapper(GitConfigToGitConfigDtoMapper.class).getClass());
+
+    bind(GitWorkdirFactory.class).to(SimpleGitWorkdirFactory.class);
   }
 }

From 04c5d6f84ac5aa69592d971b063c6f3fc25e52eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 11:13:21 +0100
Subject: [PATCH 131/188] Fix deletion of temporary clone directory

---
 .../repository/spi/SimpleGitWorkdirFactory.java | 17 ++++++++++++-----
 .../spi/SimpleGitWorkdirFactoryTest.java        |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
index c69acf5c6e..d62cd90bbc 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
@@ -11,13 +11,11 @@ import sonia.scm.repository.InternalRepositoryException;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Random;
 
 public class SimpleGitWorkdirFactory implements GitWorkdirFactory {
 
   private static final Logger logger = LoggerFactory.getLogger(SimpleGitWorkdirFactory.class);
 
-  private final Random random = new Random();
   private final File poolDirectory;
 
   public SimpleGitWorkdirFactory() {
@@ -30,13 +28,22 @@ public class SimpleGitWorkdirFactory implements GitWorkdirFactory {
 
   public WorkingCopy createWorkingCopy(GitContext gitContext) {
     try {
-      Repository clone = cloneRepository(gitContext.getDirectory(), new File(poolDirectory, Long.toString(random.nextLong())));
+      Repository clone = cloneRepository(gitContext.getDirectory(), createNewWorkdir());
       return new WorkingCopy(clone, this::close);
     } catch (GitAPIException e) {
       throw new InternalRepositoryException("could not clone working copy of repository", e);
+    } catch (IOException e) {
+      throw new InternalRepositoryException("could not create temporary directory for copy of repository", e);
     }
   }
 
+  private File createNewWorkdir() throws IOException {
+    File workdir = File.createTempFile("workdir", "", poolDirectory);
+    workdir.delete();
+    workdir.mkdir();
+    return workdir;
+  }
+
   protected Repository cloneRepository(File bareRepository, File target) throws GitAPIException {
     return Git.cloneRepository()
       .setURI(bareRepository.getAbsolutePath())
@@ -48,9 +55,9 @@ public class SimpleGitWorkdirFactory implements GitWorkdirFactory {
   private void close(Repository repository) {
     repository.close();
     try {
-      FileUtils.delete(repository.getDirectory(), FileUtils.RECURSIVE);
+      FileUtils.delete(repository.getWorkTree(), FileUtils.RECURSIVE);
     } catch (IOException e) {
-      logger.warn("could not delete temporary git workdir '{}'", repository.getDirectory(), e);
+      logger.warn("could not delete temporary git workdir '{}'", repository.getWorkTree(), e);
     }
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkdirFactoryTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkdirFactoryTest.java
index d9c41f85b5..0c39a1deb0 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkdirFactoryTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkdirFactoryTest.java
@@ -66,7 +66,7 @@ public class SimpleGitWorkdirFactoryTest extends AbstractGitCommandTestBase {
 
     File directory;
     try (WorkingCopy workingCopy = factory.createWorkingCopy(createContext())) {
-      directory = workingCopy.get().getDirectory();
+      directory = workingCopy.get().getWorkTree();
     }
     assertThat(directory).doesNotExist();
   }

From e377ce598826c66f2421589af3120cbc730c79f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 11:52:49 +0100
Subject: [PATCH 132/188] Implement first steps for actual merge

---
 .../scm/repository/spi/GitMergeCommand.java   |  50 ++++++++++++++----
 .../repository/spi/GitMergeCommandTest.java   |  43 ++++++++++++++-
 .../scm/repository/spi/scm-git-spi-test.zip   | Bin 20891 -> 23641 bytes
 3 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index 6e69a2c5ba..a4b416420d 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -1,8 +1,11 @@
 package sonia.scm.repository.spi;
 
+import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.merge.MergeStrategy;
 import org.eclipse.jgit.merge.ResolveMerger;
 import org.eclipse.jgit.lib.Repository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import sonia.scm.repository.GitWorkdirFactory;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.api.MergeCommandResult;
@@ -12,23 +15,20 @@ import java.io.IOException;
 
 public class GitMergeCommand extends AbstractGitCommand implements MergeCommand {
 
-  private final GitWorkdirFactory workdirPool;
+  private static final Logger logger = LoggerFactory.getLogger(GitMergeCommand.class);
 
-  GitMergeCommand(GitContext context, sonia.scm.repository.Repository repository, GitWorkdirFactory workdirPool) {
+  private final GitWorkdirFactory workdirFactory;
+
+  GitMergeCommand(GitContext context, sonia.scm.repository.Repository repository, GitWorkdirFactory workdirFactory) {
     super(context, repository);
-    this.workdirPool = workdirPool;
+    this.workdirFactory = workdirFactory;
   }
 
   @Override
   public MergeCommandResult merge(MergeCommandRequest request) {
-    try (WorkingCopy workingCopy = workdirPool.createWorkingCopy(context)) {
+    try (WorkingCopy workingCopy = workdirFactory.createWorkingCopy(context)) {
       Repository repository = workingCopy.get();
-      ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository);
-      boolean mergeResult = merger.merge(repository.resolve(request.getBranchToMerge()), repository.resolve(request.getTargetBranch()));
-      if (mergeResult) {
-        // TODO push and verify push was successful
-      }
-      return new MergeCommandResult(mergeResult);
+      return new MergeWorker(repository).merge(request);
     } catch (IOException e) {
       throw new InternalRepositoryException(e);
     }
@@ -44,4 +44,34 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       throw new InternalRepositoryException(e);
     }
   }
+
+  private static class MergeWorker {
+
+    private final Repository clone;
+    private MergeWorker(Repository clone) {
+      this.clone = clone;
+    }
+
+    private MergeCommandResult merge(MergeCommandRequest request) throws IOException {
+      ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(clone);
+      boolean mergeResult = merger.merge(
+        resolveRevision(clone, request.getTargetBranch()),
+        resolveRevision(clone, request.getBranchToMerge())
+      );
+      if (mergeResult) {
+        logger.info("Merged branch {} into {}", request.getBranchToMerge(), request.getTargetBranch());
+        // TODO commit, push and verify push was successful
+      }
+      return new MergeCommandResult(mergeResult);
+    }
+
+    private ObjectId resolveRevision(Repository repository, String branchToMerge) throws IOException {
+      ObjectId resolved = repository.resolve(branchToMerge);
+      if (resolved == null) {
+        return repository.resolve("origin/" + branchToMerge);
+      } else {
+        return resolved;
+      }
+    }
+  }
 }
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
index 3c58916807..bd140c68cb 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
@@ -3,7 +3,22 @@ package sonia.scm.repository.spi;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 public class GitMergeCommandTest extends AbstractGitCommandTestBase {
+
+  @Test
+  public void shouldDetectMergeableBranches() {
+    GitMergeCommand command = createCommand();
+    MergeCommandRequest request = new MergeCommandRequest();
+    request.setBranchToMerge("mergeable");
+    request.setTargetBranch("master");
+
+    boolean mergeable = command.dryRun(request).isMergeable();
+
+    assertThat(mergeable).isTrue();
+  }
+
   @Test
   public void shouldDetectNotMergeableBranches() {
     GitMergeCommand command = createCommand();
@@ -13,10 +28,34 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
 
     boolean mergeable = command.dryRun(request).isMergeable();
 
-    Assert.assertFalse(mergeable);
+    assertThat(mergeable).isFalse();
+  }
+
+  @Test
+  public void shouldMergeMergeableBranches() {
+    GitMergeCommand command = createCommand();
+    MergeCommandRequest request = new MergeCommandRequest();
+    request.setTargetBranch("master");
+    request.setBranchToMerge("mergeable");
+
+    boolean mergeable = command.merge(request).isSuccess();
+
+    assertThat(mergeable).isTrue();
+  }
+
+  @Test
+  public void shouldNotMergeConflictingBranches() {
+    GitMergeCommand command = createCommand();
+    MergeCommandRequest request = new MergeCommandRequest();
+    request.setBranchToMerge("test-branch");
+    request.setTargetBranch("master");
+
+    boolean mergeable = command.merge(request).isSuccess();
+
+    assertThat(mergeable).isFalse();
   }
 
   private GitMergeCommand createCommand() {
-    return new GitMergeCommand(createContext(), repository, null);
+    return new GitMergeCommand(createContext(), repository, new SimpleGitWorkdirFactory());
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/repository/spi/scm-git-spi-test.zip b/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/repository/spi/scm-git-spi-test.zip
index 3fbab0be38e115c7c9fe342e52ea2a4bdc4e6893..8f689e9664fc97179530c73aca4c969b1cfe962a 100644
GIT binary patch
delta 7381
zcma)A2Uru?7M@H11w$1fbOb^jNFk(9rFTI@kWd6dC@MukAG)#u6_r&idslg)qH952
zJNAZcK}AH7wJj>jDvPXwE4r3Nd@~6!ff@W>_y)qAd(S!doc}-foV#fU<>4txTx2L!
zNe#k2m7<JryRP&5)zR<RqX8L1z7gT!!O=7P{eq*zrv^@oR)wfb&$Y)lqtCp;aS%nR
zlL|qyU)i~7S?LSRQ=JM53)C>7;HHpnVGN0LbJDXiWGl;C??#+IJ7VR!cdN7s;=nqJ
zzf>2sVJx&8wW_8`xu^#H&jf}bHPot%tb$oi;uLYFL?*YA+@j;_u9s8UG^MZO>z11T
zu>4wHp<P*BM~;wM)W_8QTwGDL#bx0V3vM~vL$%c)yM^VmGvQv&7G~>yiNm<kJf74@
zD`-|DOSwASNJ;hSm#K5K+nc(Jpx)qpi`_KV?CRLJYu8iJr>{?w+F2hWE8a}W`o+$0
z)|&suCGYl4y;IZ>|K>DLXYT9qQ!egXdzX_JQXP4$l+ksh;Iqp|`qH@L>R)R8X5Ex@
zjV)_4xz>7VqfP%d7k4u}7{UZNBYa)1!G!V)?eW+%%-!p@m;fcd9(Y9=KfZ$)3$R|r
zN1HHyv{OZ$0;E(H$*YUhF)(;PhU^t@>=P=<3I^@v7|^eWki2r!U#tYwblpi_#p>>c
zfjP`2c_o1jDd4IyoA?T-s%(%76Eed8_y{D{6bQP4KFTN#vU1WSg>q<-c?p8@|EA4N
zPfkvTQ}1;K{`=is9jVFkX4<O8SF7gE);FLVR<KyC3&qJQ-e0<X!vhX@-GwuxL8mJF
zX8vB`F-4EIzic660)u8=d}XsVG_!-nh&g;KvTMSOL$lugdHvJ*t-e<(r~N>m4%Rk4
zEQ;CkrI}Ax=LMEAv>zMy^fLdADy$U2rKNX1{ztd5<MZ9-s~4;GZ-re{mkWbCJ07K-
zU$F0G+LVT_MG>WeVUsmoMGKM^HwKq(T5@+rMf1(;4SjpJy?Ourr_bj!o_+NRNT{m6
z*(#(@Z+Y6UraE_?a#TI7T5VZE-3LvF`^>RhAE(&XZ~K_n&)Im0(gO@u>C#T!*`52~
z>yzsCoc3SKd3NtFE3fqIPwl^T;mzv}r;V0G1JMqBW~WZJqsv$-Xr>t1$sL-W%N*h=
z0YMNXBeu6E9r&2&YZJH(W}39>kG3i)Tn|h#*Pl4bdwC8LqihF-=8OpjD5?oFL5;Z=
z5gte3iRu(7mc2AqEL?UN%@f`zJ`7NN%+AfoXU>(R=QA@UDQWr4Y{}dVNlNN$dD_4d
z89@aEtzYet1GBXPW(n%vX=m2|^T1Ts-&@O$(XP^O;GlcfD9%WE^{>KH)1&gB!pE`h
zMVf!Ji|c-qn*SXA*A|xspVjB;XV>_p-cPX1HPJSncP{bS?RUFfUcdQ$-ftgz{!REY
zGby%ciL_KuBUq+y^{an(7Ba)=!MyOJF_}e%PkY5@XL$A@Kl%TnRv%-3Mk{RXe~}3*
z*$XPTQ&M^V?DbnSySq$cxUA(|Ny;y~=a-zTy4Cwu6N`y1U`^5o6D_QX?g7&+>U8C~
z6ywmM)32^Nqj{7y4&<5YO0m>J;)J^Oi8*&!TBTc0?|Wl8_W0Wi9(#QJ;j%!#Sk{TF
z*?!+g{unh~=dWb3;QaZ#c<(v({?D%mZ*JuOY23Q`eqxvdsA+tp78Y!v$+pcBA9K}G
zTG6m%rS7`K$ctGyhcooE=z(b&EiVh)T%~5!LUHTUtnK&1Y?VdyF+ZMv{$p>(oX#`p
z>9;o3+HF0_Oga)(rsKP;D7EB8^{%Ygn<<m5W9x(C4p<pziKf5xR(W%|bN|u9A>)qd
zJ@`(l`LX!)(<22pLiWFmGyUDqa^=~XYY(irR7w4NLS4j_c`4n?nBmgvZv_SW9lRWN
z_FhbvR(1eZs@b8gBh%*V`5*aphx)atN<BN?Uy_)ng~5Usd$uQ)WtYCtT-v?tx91((
z-h1koi7GYMT(;<|`kKVNyTT|gxpYaOqhN93q6cnKxg{qv5Abx$<}T2*Jsx@~(za#V
z+v3&8!()c=SzkWv|1)vk!)yzSa-D9~>j$eJ2E@E9m#&Kl@^uMcy|=*poX$>R1^u`M
zSFNUF+xk1rl!=iEE3?Z#i47N?Ny%=h@S|CdbDV!{U%;NKkLy00wLM%Oc3-F;dMlvo
zWnb^(*VolcJ@&@U&-~+c%_F~wCRy9ty7bs>7ryH~VR~qx^1;j0x}G=v6IyrmtBkqk
zD#|w9b>QF`zl{m?p_gw*6-{lmQlh!%T%x?or1bavCWzZuX|soB0a?M_6;8+V@00{G
zwu|NmmoJ5HoY)mJF+S(}iDqWc+NKM(TxdGmwS80C#f7Imsa_QP{KDu6Y%ERm$XSME
z9I%RK_>F8q2YC!N@Ru!3+j-;(2gcfow0|F2Nq~I28c<<nOG1I$Rw9y7H-;tXur~&w
z)-;m0nbsohw*(z6*7-nUNv5O9Ql#BVm|wy)1h1?^L5`Ij2<D?Sbs7skIg#npV~R*J
zY6<g%K0)e09$phd2aD|0Kpu-@MKY(5654P*B8rt7^c;pX(%?kk#W$51VBkX2zDY2Z
z=OWVHOBnsxr4<zT=%B&S8`Y2tK6G%L;Z7nGwsu6_Wei@i$ik?~Cev8JzO7V@!RMJ1
zT`F{upGOfW2CzDBSQ#YugZ$*cR&21bueC<=KlZTE{GXdTQz9<NXQD#b&Jv-R&y(<-
z)14(QJWhI=K*ALZS;90HkHu%RoyB~<m?t~>Fja#o(M6%c9rPzBHK;wL>6SzAO@}E#
z4h^@a1=)u*hBiHgp$##rA7m$FQn(zwrd+Z}yK%{oRn3hB40~G=%q7{2NL+i}UI;uK
z$>fV1$&gg%7z+Yyj7=nbxkr<q+>IFA=Fl#Ir!yH-_BzKY$rvpQ30p1zV>b4T8WL>9
zp|B&;YiKyIXIMzs%v7N;O(J9o(#2^kE}zfg3k508Y_T&-kiz4pNK)7-E-oBrSx6LB
zNr#Muph8Oa>ckK#Teq~R$-eu$IoH01Z3`NgSbS<pSois+$d;eDzVm_)UMV+d4s2`s
zk6_W}=($NonfuH{40zLzY|df+?6k^7V=XO~#oam*cnECR@zee~mzXo$Jnui~^-JsH
zcU)JNtlz!2=gQ8_k{b<1`+iyxA3r^$bn3&Tws!T^^j`IUKCblbyL6@I#4+Trja_R)
zzF+JVne+Be)`MWiuFh;}>z>Qw5^Fu5ZOjsPpX$lz%=>cXs@qNK9WQv@xPyI^-rG+$
zeN^#H30p5ijcK49HH#3MHUaBkBO>AuNQ=2(kmc<t%hTbc5jhx(7*~u(j1Y1~5@8W@
z^-Z3Ufkq2^6eETT5j#7xgy}q#LM*X>ClvD2($a*foYWNbD~}`Qu=p%iI)@N3)uD)i
z7Hel-wb}*us@T3yS$Enzx2onpe4w1&ux2A2D)Hg?etxI^Z(D2hqwvkAnyq&wol0)L
zI-?Qdm)V>IM)uYqnL{JtM-hjNADtYbiF5k5ur9SBJ4L!|UZAIft+v`oXah3`viUza
z+yiQSE%Y>_fi|9oJ|Tq;Wb1=L^5_bjX!_en${v{W6`iw*qXvqcI3$d}=w!kdq7mBu
zydvBVjSlvxqG>K7DmZXPkiWN|%<~vVhz<2kz6)xl#dt!^4nbg!fK8J4j|$vKM!yOW
zn&O242<Mv{DbjN&)&pB&Mbg1GzA=d?)FfHe-t@J0(%^P<(d~S*U?)j9LiYccNo2PY
z^1~uJ@5ZDGv*H^-P2fOcS%AP%p8}gwN$y2}kI+_|U<9ZWBIeW3a17pdC__~2wqsao
z1lq0${2BsYuEtqI*Cvsnn4;0HI_RiK2tvCV=vc`d^pE1j2daXQBru=jhGXSEC>PSr
zkCkMg6~7!Im}Mic6F|3zDJXW;fX~5Tt*ic+0qa168v^&i;G-KdG^B|RO;!RPZni^1
z4(<rNK?TIQ<3lUZp;9$)LSZPx1A!0efI<(ep@lEp5$arh2$<+vfPY=phsF=OBGgnv
z2ryyOVdJw=-It6&rJG$8ssD&q1akjjK0H>k#TXjAFc`%Lh#72(&5`xMq!AQ)BCxk9
z$nZ27GPc&w6wo|1%(!Ndyx*J_jV^ujXk_rQd7mORr1^vMWH2Y6JUon8PmFD0@S_C{
zZc7V#?R|2XJb9lhlZtiF!|*4Q3T}JZP$}jRXf`*HqK2|G?+r)kpl&%Nu>)avSFH%i
zsEGr6CZ{Yap1>4E@xXbKx#~2F0U6*>BqMXwxZ-Uqmh*5Uc9vvW4hR?>--AkVK7-0h
zh8ArMXsAS#xr|_~j2N*I8a5Nrl5((`{1!lJ{SY|Q8ocr|9s-D_KLQ`H1|I%CLqk>G
z2wZCe8olvZJ>CeFY72oLE3Pi;x0jDc;>XDsrIam5@Wt0i(V+%gaKIOr+#iB4HlxXO
z&{lQ|dH|yG=xrnA*`Nxa*+JmEB^UhQjgv1Y7=fGY!RBCG&joa7yaRY0jO)=0L>Lf)
z>){LJdO``fUmk)`{SgRcu(+TrWVoJ72nd^u>&cyrz$%Vl%Vb<nx(~vb<b><tU<W$7
zpBEY<U<*$Ap#E_JFMRODs54+~CO|@Q6%nBb9K!@fp*{v9poVu5;IKDc`o+7Hg{zfy
zA*focH6U_o=%gU_AcIV$KvpFU!v%h`BQaBGNyzj96ljj|Y}~?huG}$%#50I};LW9L
zDw?y64FM6C3)Cj7YmV>*FtewFT5lR7hJ$P1rph%~5ukbBAE9pIK%mH;3tR*65I+fY
zq&Ndw5bl0v5H^w+gvV%g7y|2X!MQMeQX4uH%LVG;qr^zoh{$84>4MuQ#M%<nR|FCd
zdH`qt@TNr3Dbd3PezUMJQ|M91^a6||%Xzqkya5Y|B*_RwsEs@boI<#uAyAzhn+p35
z;^R_f#XXsR;=WynmG+AJE*~!Nn}xoOLZ$yLy+bIPA;7Io6OM)={V;^OQviX@94=TG
zhNB2Y2*X^6OOVy{s9vmp9mYiv=!Z}xLI_mZaKSHrxCAV9?sWx=0&t9N4M5;-S8y``
zM<P}Op{X9WbO#v`rbD^9ItXFRbjQ{61~Tefg8C0ZXocer7{NX<Blsjo9<g+nM?hZQ
zIe0*dg*>`JLbHdSMu=GjIu9=$h(%^=Bm&>_0IE}rhPL1^1%VAcLEIF}ZvxAZvD$M$
zwn7;}pcAl-M5ryE5cnCr&YBgeo<h1=46MTod&SKLdJR*ga4$~=C?G}mRO<x}MB11s
VC{tF!Dxz@ohlZAR{7Kk<{{vF7RKx%P

delta 4884
zcmaJ_2~-nl68_T(s31oekN_c|m=H*Zgb+@-50x7giA0}*5F8YZg6A&J4C;8h=#;D%
z&Zu~-Cn|!YuE(f&uc)KAipTEGA`ef{!3#(C?*wSDn+-2{@ORZ$RbN&8RpH*xoJ|!R
zLs}x2XMw2KgB4dJ7pMxCIN{%^w>1)?nAGIt`1A>JvGM82qlS%6?}xYwoBCAhJ!`Hd
z;_%uy2=VN(barm8F4ujUZjO6F{xqF?p1#n1VnOy)ods=RCpI9<FWTjZ#i=(B8yGS?
zE-KcDd&#;!Rl~$B)a8Y^<BuZ6x4P`yBE{6~qM5ovBPy(k6burg9R0Ms{7FWPRSkET
z7;9i9f91P7Jsk!mCl1U-1E8Mx=9_$`S(xY?&D5%@c6R2#IG&Q_(PmyB0_t3RnU8=k
z{41DqgP2dMQn^+f*lx~-*J%ET%c61HqPY)z=g0<j*>M*EC+$cUt&esKc!p}s|I_l%
z$~MgXQk*w4%zys0T-{tFca50;cqS1=t^Eu0va+&>i5Xv}6x)=jxhtP=mskBgVB^^{
zH-27JQqn3*8_rv5)^@_i->Ld@x@Gwv1OGkw_1^pmZ(}o+2PIF-($^{@+uVlj>^ty@
z;6lZQb8F#{%-%3DD>-_7QQLvODyx8|I18KO!H=3Iyxq~FuI5=-?r41_UH^}^y%nV;
zVVMzTlkL(@tGRYo{+<pG%Qx){)cbEH6EZiy+TF7Ba&y!$SzY4l;N8li1Ff60BDZb*
zoDdo4DSNYP!P&d*jnCeMEc#;UG|xFu-;|Y=ys-UQW!0HkzrC<=8)Egyp#78AtemBr
zO4}v?M<nMn>Hs1{{(J^0@V%%(#*jsbs&uLq`Wjm)YHQ{76_{m>Ih1(V8<dz@MinAd
zeXC))y|1nLzos;KJsrtkCzLH)`rf*oSC&v~HG9sM6L;<gR-OA!<{f7Ft7dEJhml_@
zZy&NOZ`-kPPueK2`itl9Ip+>tCvH3+u=C7WUg;0{4KDJQF&~fH72g-tG~HQu>P6Yk
zp*C^h3k@{^!7pM|E#sYbJevMfQ_Z=Cnj@_ret+q)a`Se?k(;S*2V9;V^1S8pT4jCh
zwyL4Uw^Az37ZfhPf8yz$q0f$-auDVeb55!1LZx*XB{h*RMy+vpKT}Ysm=SGoi0Ef{
z_ISy>ml5}0J3PHVY5m2z#WP<Wyjo+pB$I!dSw3}2<Sh@w55w2TJEZukE(rHrS-c`8
z!F%lNz{4XdKIYsgQtYpJwoh?Vs=7S?WLe$9)9)vgH!53G_*<--PxC)54r`ho|KGVh
ze!rXZve$(C=&ABq`&?Xlcj~fb3$|n(+c0%=`<%Panp<k#?OxiNu|%V8Klmg($N%P^
z-z*Oh)~EaY#tYHPQ@p%lp6^?IbazNudG%jn>=Mo%J$$qMbWQe}pOn=)^|s2@o*Nr~
zx1=%%t#Jcjm7C+hUNUUDEK~GXBcaw!?2!BLPAWqZzPLrObYZGH?)Hjdb}(a*g!vf$
zHmDYA$pP>|%y*=2SOzRYz*k6IeX|wDjukv+GyT|0%cqL1$Ndb&GG|EgN`y*pFSz6>
zWhr%zRLd6=U+Wb}Js`n{O@5(|mQURoJ?*^ok;9?{JMd9kz+P#8N0u0jB-bSf;E6Pp
zzv%7P7xUXdKbY_B3+udWz&lvlD?+M9042ep{EG}9t_L^5yEt2zuCjtsi6u*{dnH=_
zSVpV^JP$*DkPwPh{aJK2sI)9O<M{<cT?m`}^AI*0nj!UIK?-4i0GrO00Iie}4?=S}
ziB~SCj#N$@{vQHa=Mm$L6wb#KQZ$G8u|aA5v@ADQt)B*(#+cHxI+RUsf2fvEjpCkZ
z6@<CMRZ{30=w~WD*75|tjLl}TtcHco7?Q0_50I|lqUb&8hExF*DneNb{Iuc*P99sK
zZVO^doK<iz1gY5=7_HW_6xA7ZW=B!=cg<6qSZH~`)__0yYFWy<pGt!n>^-tq$pRQ8
z4`s=jUfuvQiMJiImGIDVfv`|#_D605jcZfaV#L%(@Czw|ec`qa)P=!#4mZO?_>7ed
z3c~#1QiLDNlm3x%_-B}cCEJ4VAuRH_;iMyn5OG=dPe_ZDj%8Uh(-LU~<~}LF(-$E;
zbkX*bZ2W0jF3k{^S<%ZPNofrh>D(T%5Vbw_D0^z8Q|8vR3Vgdmr(g@Yx}u!I{OL3E
z_0vYDvnj)wD3Z9vftOK^eLA*eh>j%*I|8Q1l3hnrqe)^07dAypyN)Wb)G;%-8SB+`
z)E`TgnL|i4t#}0=HT8k_-4s1zNTS{nM#s=t4`WC!vPV$rI0$@Vt-1gg#gG;)0}%RF
zub)z+fJd>ykzK32DQMFs!`vB7L}2DH$5k$<bA!YbFsDIFCh68Bq-65+xMf&rS{Fx3
zB(5DYy16+8vvPI4h&IQO1}70h1^P)vCOE1CSyRTghauDtbx-4%PN=RjVa(0W3NTfu
zt^O)}jI)AFt+heo-r+|_li}EUb%tIUDB3z-wjItOWQ$%zO?K~&XZo&Vq=8y6m?6UB
zp`P3$?g&KgPWIR~!*eJbM)ors)By?)A_O2GN9W%>Nu=!C!vQA`g!B_9>vCpxaLedE
z2u~!5u^v#6DD0}EQhc<<15PGJcO4ywCy7;q;Xynt^(CI<-WrU+U8<&>ZT>nW7@tBC
z>0(%!LhDrGqYYwsm_j3;(vV`Ygm%*}$W#Ss47`g8BzLj|L6cMs-idVB)}u&qsAo5X
zJQG6JqpwJYVH%Ps@q}3#+I(}I2(HCj%WI`HfSMYJ|1bA&NFuQ5>=_OkTw>vc;EF^I
z8{=uW=8qr=7jM`%f)2k9A7y#NA0ue{IDF!PH$2zSQZ{2qVxSDd#?VsNlSm?iglp-v
z)T?xo*hGTsXj%$m$sOf%907s7P}$i5kmV<Uqa&>dIf8k9YWO&kcK_ZOQf%kb4UAe)
zF)6PZta@jXT#XNcYoTgbl}RI*Cz0Y`yCE3&42;06K}{0L6(|rWWokH{L?cjPn<?Q_
z5*@Z%GD##TAvu{28&|OSf|B+$D8S??wMzGBGMJM}5|+NOBb8RBvJ|3%aT&A;Lk7t;
zsPG&OG8Xn=Mj_&YBidCEI*QhrfR7^mVAUuZxudeg@BL`kj7tVvWkH`2BsWZr;H0k_
zCXb*gph$e9?uL+K3XVx)6J{pJ9~`>%)|n`gtyPZ;p)de`87}H-Yb@a3Q{Y$tZEJdV
z&J>e1#uNoS1qc)fBJF@KFv``4K!m#eW5-xA%xg?NmgFu9M9>m$4|B%S!8YRa_xQXa
u!l}o_Hbjf(X%OUVUAl~|z(>_Va7^pr)@{a_nNt^W4E`C1+tVwU`s;r;+;4^e


From d5da106038ca8e269e4c9b27aa54e08a54b764fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 12:52:40 +0100
Subject: [PATCH 133/188] Implement merge using api of class Git

---
 .../scm/repository/spi/GitMergeCommand.java   | 46 +++++++++++++------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index a4b416420d..c9a6e007ab 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -1,9 +1,12 @@
 package sonia.scm.repository.spi;
 
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.MergeResult;
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.merge.MergeStrategy;
 import org.eclipse.jgit.merge.ResolveMerger;
-import org.eclipse.jgit.lib.Repository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.repository.GitWorkdirFactory;
@@ -47,28 +50,41 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
 
   private static class MergeWorker {
 
-    private final Repository clone;
+    private final Git clone;
     private MergeWorker(Repository clone) {
-      this.clone = clone;
+      this.clone = new Git(clone);
     }
 
     private MergeCommandResult merge(MergeCommandRequest request) throws IOException {
-      ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(clone);
-      boolean mergeResult = merger.merge(
-        resolveRevision(clone, request.getTargetBranch()),
-        resolveRevision(clone, request.getBranchToMerge())
-      );
-      if (mergeResult) {
-        logger.info("Merged branch {} into {}", request.getBranchToMerge(), request.getTargetBranch());
-        // TODO commit, push and verify push was successful
+      try {
+        clone.checkout().setName(request.getTargetBranch()).call();
+      } catch (GitAPIException e) {
+        throw new InternalRepositoryException("could not checkout target branch " + request.getTargetBranch(), e);
+      }
+      MergeResult result;
+      try {
+        result = clone.merge().include(request.getBranchToMerge(), resolveRevision(request.getBranchToMerge())).setCommit(true).call();
+      } catch (GitAPIException e) {
+        throw new InternalRepositoryException("could not merge branch " + request.getBranchToMerge() + " into " + request.getTargetBranch(), e);
+      }
+      if (result.getMergeStatus().isSuccessful()) {
+        logger.info("Merged branch {} into {}", request.getBranchToMerge(), request.getTargetBranch());
+        try {
+          clone.push().call();
+        } catch (GitAPIException e) {
+          throw new InternalRepositoryException("could not push merged branch " + request.getBranchToMerge() + " to origin", e);
+        }
+        return new MergeCommandResult(true);
+      } else {
+        logger.info("Could not merged branch {} into {}", request.getBranchToMerge(), request.getTargetBranch());
+        return new MergeCommandResult(false);
       }
-      return new MergeCommandResult(mergeResult);
     }
 
-    private ObjectId resolveRevision(Repository repository, String branchToMerge) throws IOException {
-      ObjectId resolved = repository.resolve(branchToMerge);
+    private ObjectId resolveRevision(String branchToMerge) throws IOException {
+      ObjectId resolved = clone.getRepository().resolve(branchToMerge);
       if (resolved == null) {
-        return repository.resolve("origin/" + branchToMerge);
+        return clone.getRepository().resolve("origin/" + branchToMerge);
       } else {
         return resolved;
       }

From 74382f26b7255496ef512dc563c57e8a9c5daf36 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Wed, 7 Nov 2018 12:55:09 +0100
Subject: [PATCH 134/188] Moved Profile component to top level; added error
 message

---
 scm-ui/public/locales/en/commons.json        |  9 ++++++
 scm-ui/src/containers/Main.js                |  2 +-
 scm-ui/src/{users => }/containers/Profile.js | 34 ++++++++++++--------
 3 files changed, 31 insertions(+), 14 deletions(-)
 rename scm-ui/src/{users => }/containers/Profile.js (64%)

diff --git a/scm-ui/public/locales/en/commons.json b/scm-ui/public/locales/en/commons.json
index b1bad56993..05e9f79d16 100644
--- a/scm-ui/public/locales/en/commons.json
+++ b/scm-ui/public/locales/en/commons.json
@@ -38,5 +38,14 @@
   "paginator": {
     "next": "Next",
     "previous": "Previous"
+  },
+  "profile": {
+    "actions-label": "Actions",
+    "username": "Username",
+    "displayName": "Display Name",
+    "mail": "E-Mail",
+    "change-password": "Change password",
+    "error-title": "Error",
+    "error-subtitle": "Cannot display profile"
   }
 }
diff --git a/scm-ui/src/containers/Main.js b/scm-ui/src/containers/Main.js
index 97ffa60125..05e3819c8a 100644
--- a/scm-ui/src/containers/Main.js
+++ b/scm-ui/src/containers/Main.js
@@ -19,7 +19,7 @@ import SingleGroup from "../groups/containers/SingleGroup";
 import AddGroup from "../groups/containers/AddGroup";
 
 import Config from "../config/containers/Config";
-import Profile from "../users/containers/Profile";
+import Profile from "./Profile";
 
 type Props = {
   authenticated?: boolean
diff --git a/scm-ui/src/users/containers/Profile.js b/scm-ui/src/containers/Profile.js
similarity index 64%
rename from scm-ui/src/users/containers/Profile.js
rename to scm-ui/src/containers/Profile.js
index b8aa3ae068..adb1ba5d6c 100644
--- a/scm-ui/src/users/containers/Profile.js
+++ b/scm-ui/src/containers/Profile.js
@@ -7,14 +7,15 @@ import {
   Navigation,
   Section,
   MailLink
-} from "@scm-manager/ui-components";
+} from "../../../scm-ui-components/packages/ui-components/src/index";
 import { NavLink } from "react-router-dom";
-import { getMe } from "../../modules/auth";
+import { getMe } from "../modules/auth";
 import { compose } from "redux";
 import { connect } from "react-redux";
 import { translate } from "react-i18next";
-import type { Me } from "@scm-manager/ui-types";
-import AvatarWrapper from "../../repos/components/changesets/AvatarWrapper";
+import type { Me } from "../../../scm-ui-components/packages/ui-types/src/index";
+import AvatarWrapper from "../repos/components/changesets/AvatarWrapper";
+import { ErrorPage } from "@scm-manager/ui-components";
 
 type Props = {
   me: Me,
@@ -28,8 +29,14 @@ class Profile extends React.Component<Props, State> {
   render() {
     const { me, t } = this.props;
 
-    if (!me) {
-      return null;
+    if (me) {
+      return (
+        <ErrorPage
+          title={t("profile.error-title")}
+          subtitle={t("profile.error-subtitle")}
+          error={{ name: "Error", message: "'me' is undefined" }}
+        />
+      );
     }
     return (
       <Page title={me.displayName}>
@@ -41,7 +48,6 @@ class Profile extends React.Component<Props, State> {
                   {
                     // TODO: add avatar
                   }
-                  }
                 </p>
               </figure>
             </div>
@@ -50,15 +56,15 @@ class Profile extends React.Component<Props, State> {
             <table className="table">
               <tbody>
                 <tr>
-                  <td>{t("user.name")}</td>
+                  <td>{t("profile.username")}</td>
                   <td>{me.name}</td>
                 </tr>
                 <tr>
-                  <td>{t("user.displayName")}</td>
+                  <td>{t("profile.displayName")}</td>
                   <td>{me.displayName}</td>
                 </tr>
                 <tr>
-                  <td>{t("user.mail")}</td>
+                  <td>{t("profile.mail")}</td>
                   <td>
                     <MailLink address={me.mail} />
                   </td>
@@ -68,8 +74,10 @@ class Profile extends React.Component<Props, State> {
           </div>
           <div className="column is-one-quarter">
             <Navigation>
-              <Section label={t("single-user.actions-label")} />
-              <NavLink to={"me/password"}>{t("profile.change-pw")}</NavLink>
+              <Section label={t("profile.actions-label")} />
+              <NavLink to={"me/password"}>
+                {t("profile.change-password")}
+              </NavLink>
             </Navigation>
           </div>
         </div>
@@ -85,6 +93,6 @@ const mapStateToProps = state => {
 };
 
 export default compose(
-  translate("users"),
+  translate("commons"),
   connect(mapStateToProps)
 )(Profile);

From 8a23537e6857bf0aa51611cb05c9789c4b6450d6 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Wed, 7 Nov 2018 13:10:29 +0100
Subject: [PATCH 135/188] Removed unused i18n line

---
 scm-ui/public/locales/en/users.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json
index 2c29039f67..07540134be 100644
--- a/scm-ui/public/locales/en/users.json
+++ b/scm-ui/public/locales/en/users.json
@@ -44,9 +44,6 @@
     "information-label": "Information",
     "back-label": "Back"
   },
-  "profile": {
-    "change-pw": "Change Password"
-  },
   "validation": {
     "mail-invalid": "This email is invalid",
     "name-invalid": "This name is invalid",

From 7ca88e7839efef9bc7bbe4f2526517e7ca415a52 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Wed, 7 Nov 2018 12:11:43 +0000
Subject: [PATCH 136/188] Close branch feature/ui_userprofile


From 26d5e6e062232ccb5f5b761400850403deb8af37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 13:17:21 +0100
Subject: [PATCH 137/188] Set merge message

---
 .../scm/repository/spi/GitMergeCommand.java   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index c9a6e007ab..c2b903e57f 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -19,6 +19,10 @@ import java.io.IOException;
 public class GitMergeCommand extends AbstractGitCommand implements MergeCommand {
 
   private static final Logger logger = LoggerFactory.getLogger(GitMergeCommand.class);
+  public static final String MERGE_COMMIT_MESSAGE_TEMPLATE =
+    "Merge of branch %s into %s\n" +
+    "\n" +
+    "Automatic merge by SCM-Manager.";
 
   private final GitWorkdirFactory workdirFactory;
 
@@ -56,27 +60,33 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
     }
 
     private MergeCommandResult merge(MergeCommandRequest request) throws IOException {
+      String target = request.getTargetBranch();
+      String toMerge = request.getBranchToMerge();
       try {
-        clone.checkout().setName(request.getTargetBranch()).call();
+        clone.checkout().setName(target).call();
       } catch (GitAPIException e) {
-        throw new InternalRepositoryException("could not checkout target branch " + request.getTargetBranch(), e);
+        throw new InternalRepositoryException("could not checkout target branch " + target, e);
       }
       MergeResult result;
       try {
-        result = clone.merge().include(request.getBranchToMerge(), resolveRevision(request.getBranchToMerge())).setCommit(true).call();
+        result = clone.merge()
+          .setCommit(true)
+          .setMessage(String.format(MERGE_COMMIT_MESSAGE_TEMPLATE, toMerge, target))
+          .include(toMerge, resolveRevision(toMerge))
+          .call();
       } catch (GitAPIException e) {
-        throw new InternalRepositoryException("could not merge branch " + request.getBranchToMerge() + " into " + request.getTargetBranch(), e);
+        throw new InternalRepositoryException("could not merge branch " + toMerge + " into " + target, e);
       }
       if (result.getMergeStatus().isSuccessful()) {
-        logger.info("Merged branch {} into {}", request.getBranchToMerge(), request.getTargetBranch());
+        logger.info("merged branch {} into {}", toMerge, target);
         try {
           clone.push().call();
         } catch (GitAPIException e) {
-          throw new InternalRepositoryException("could not push merged branch " + request.getBranchToMerge() + " to origin", e);
+          throw new InternalRepositoryException("could not push merged branch " + toMerge + " to origin", e);
         }
         return new MergeCommandResult(true);
       } else {
-        logger.info("Could not merged branch {} into {}", request.getBranchToMerge(), request.getTargetBranch());
+        logger.info("could not merged branch {} into {} due to {}", toMerge, target, result.getConflicts().keySet());
         return new MergeCommandResult(false);
       }
     }

From 2d04e6c2f0f1314ca21546d8ee382a9a9b20de5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 13:34:35 +0100
Subject: [PATCH 138/188] Specify not mergeable files in merge result

---
 .../repository/api/MergeCommandResult.java    | 28 +++++++++++++++----
 .../scm/repository/spi/GitMergeCommand.java   | 16 ++++++-----
 .../repository/spi/GitMergeCommandTest.java   | 15 ++++++----
 3 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java
index 024e7bbc89..c5a4a57d42 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java
@@ -1,13 +1,31 @@
 package sonia.scm.repository.api;
 
-public class MergeCommandResult {
-  private final boolean success;
+import java.util.Collection;
+import java.util.HashSet;
 
-  public MergeCommandResult(boolean success) {
-    this.success = success;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableCollection;
+
+public class MergeCommandResult {
+  private final Collection<String> filesWithConflict;
+
+  private MergeCommandResult(Collection<String> filesWithConflict) {
+    this.filesWithConflict = filesWithConflict;
+  }
+
+  public static MergeCommandResult success() {
+    return new MergeCommandResult(emptyList());
+  }
+
+  public static MergeCommandResult failure(Collection<String> filesWithConflict) {
+    return new MergeCommandResult(new HashSet<>(filesWithConflict));
   }
 
   public boolean isSuccess() {
-    return success;
+    return filesWithConflict.isEmpty();
+  }
+
+  public Collection<String> getFilesWithConflict() {
+    return unmodifiableCollection(filesWithConflict);
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index c2b903e57f..800317ef67 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -35,9 +35,10 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
   public MergeCommandResult merge(MergeCommandRequest request) {
     try (WorkingCopy workingCopy = workdirFactory.createWorkingCopy(context)) {
       Repository repository = workingCopy.get();
+      logger.debug("cloned repository to folder {}", repository.getWorkTree());
       return new MergeWorker(repository).merge(request);
     } catch (IOException e) {
-      throw new InternalRepositoryException(e);
+      throw new InternalRepositoryException("could not clone repository for merge", e);
     }
   }
 
@@ -48,7 +49,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
       return new MergeDryRunCommandResult(merger.merge(repository.resolve(request.getBranchToMerge()), repository.resolve(request.getTargetBranch())));
     } catch (IOException e) {
-      throw new InternalRepositoryException(e);
+      throw new InternalRepositoryException("could not clone repository for merge", e);
     }
   }
 
@@ -65,7 +66,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       try {
         clone.checkout().setName(target).call();
       } catch (GitAPIException e) {
-        throw new InternalRepositoryException("could not checkout target branch " + target, e);
+        throw new InternalRepositoryException("could not checkout target branch for merge: " + target, e);
       }
       MergeResult result;
       try {
@@ -78,16 +79,17 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
         throw new InternalRepositoryException("could not merge branch " + toMerge + " into " + target, e);
       }
       if (result.getMergeStatus().isSuccessful()) {
-        logger.info("merged branch {} into {}", toMerge, target);
+        logger.debug("merged branch {} into {}", toMerge, target);
         try {
           clone.push().call();
         } catch (GitAPIException e) {
           throw new InternalRepositoryException("could not push merged branch " + toMerge + " to origin", e);
         }
-        return new MergeCommandResult(true);
+        logger.debug("pushed merged branch {}", target);
+        return MergeCommandResult.success();
       } else {
-        logger.info("could not merged branch {} into {} due to {}", toMerge, target, result.getConflicts().keySet());
-        return new MergeCommandResult(false);
+        logger.info("could not merged branch {} into {} due to conflict in paths {}", toMerge, target, result.getConflicts().keySet());
+        return MergeCommandResult.failure(result.getConflicts().keySet());
       }
     }
 
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
index bd140c68cb..c6949a3a11 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
@@ -1,9 +1,11 @@
 package sonia.scm.repository.spi;
 
-import org.junit.Assert;
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
+import sonia.scm.repository.api.MergeCommandResult;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 public class GitMergeCommandTest extends AbstractGitCommandTestBase {
 
@@ -38,9 +40,9 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
     request.setTargetBranch("master");
     request.setBranchToMerge("mergeable");
 
-    boolean mergeable = command.merge(request).isSuccess();
+    MergeCommandResult mergeCommandResult = command.merge(request);
 
-    assertThat(mergeable).isTrue();
+    assertThat(mergeCommandResult.isSuccess()).isTrue();
   }
 
   @Test
@@ -50,9 +52,10 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
     request.setBranchToMerge("test-branch");
     request.setTargetBranch("master");
 
-    boolean mergeable = command.merge(request).isSuccess();
+    MergeCommandResult mergeCommandResult = command.merge(request);
 
-    assertThat(mergeable).isFalse();
+    assertThat(mergeCommandResult.isSuccess()).isFalse();
+    assertThat(mergeCommandResult.getFilesWithConflict()).containsExactly("a.txt");
   }
 
   private GitMergeCommand createCommand() {

From e9396f4947ab3aeb839e77825dc6994542704432 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 7 Nov 2018 13:39:38 +0100
Subject: [PATCH 139/188] fixed missing validation update on change

---
 .../scm-hg-plugin/src/main/js/HgConfigurationForm.js   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/scm-plugins/scm-hg-plugin/src/main/js/HgConfigurationForm.js b/scm-plugins/scm-hg-plugin/src/main/js/HgConfigurationForm.js
index aa6e3ac206..2b6fc130bc 100644
--- a/scm-plugins/scm-hg-plugin/src/main/js/HgConfigurationForm.js
+++ b/scm-plugins/scm-hg-plugin/src/main/js/HgConfigurationForm.js
@@ -52,11 +52,10 @@ class HgConfigurationForm extends React.Component<Props, State> {
     this.setState({
       validationErrors
     });
+
+    return validationErrors.length === 0;
   };
 
-  isValid = () => {
-    return this.state.validationErrors.length === 0;
-  };
 
   hasValidationError = (name: string) => {
     return this.state.validationErrors.indexOf(name) >= 0;
@@ -65,10 +64,7 @@ class HgConfigurationForm extends React.Component<Props, State> {
   handleChange = (value: any, name: string) => {
     this.setState({
       [name]: value
-    }, () => {
-      this.updateValidationStatus();
-      this.props.onConfigurationChange(this.state, this.isValid());
-    });
+    }, () => this.props.onConfigurationChange(this.state, this.updateValidationStatus()));
   };
 
   inputField = (name: string) => {

From 8771f68081b7bfdbee0b3c98f26c8f4ccbd0b399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 14:02:02 +0100
Subject: [PATCH 140/188] Set author for merge

---
 .../repository/api/MergeCommandBuilder.java   |  6 ++++++
 .../repository/spi/MergeCommandRequest.java   | 21 ++++++++++++++++---
 .../scm/repository/spi/GitMergeCommand.java   | 11 ++++++++--
 .../repository/spi/GitMergeCommandTest.java   | 17 ++++++++++++++-
 4 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
index 65eed2f2a1..00acb66874 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
@@ -1,6 +1,7 @@
 package sonia.scm.repository.api;
 
 import com.google.common.base.Preconditions;
+import sonia.scm.repository.Person;
 import sonia.scm.repository.spi.MergeCommand;
 import sonia.scm.repository.spi.MergeCommandRequest;
 
@@ -23,6 +24,11 @@ public class MergeCommandBuilder {
     return this;
   }
 
+  public MergeCommandBuilder setAuthor(Person author) {
+    request.setAuthor(author);
+    return this;
+  }
+
   public MergeCommandBuilder reset() {
     request.reset();
     return this;
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java b/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java
index e01e580afa..a4e22b5ad1 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java
@@ -4,6 +4,8 @@ import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Strings;
 import sonia.scm.Validateable;
+import sonia.scm.repository.Person;
+import sonia.scm.util.Util;
 
 import java.io.Serializable;
 
@@ -13,6 +15,7 @@ public class MergeCommandRequest implements Validateable, Resetable, Serializabl
 
   private String branchToMerge;
   private String targetBranch;
+  private Person author;
 
   public String getBranchToMerge() {
     return branchToMerge;
@@ -30,8 +33,18 @@ public class MergeCommandRequest implements Validateable, Resetable, Serializabl
     this.targetBranch = targetBranch;
   }
 
+  public Person getAuthor() {
+    return author;
+  }
+
+  public void setAuthor(Person author) {
+    this.author = author;
+  }
+
   public boolean isValid() {
-    return !Strings.isNullOrEmpty(getBranchToMerge()) && !Strings.isNullOrEmpty(getTargetBranch());
+    return !Strings.isNullOrEmpty(getBranchToMerge())
+      && !Strings.isNullOrEmpty(getTargetBranch())
+      && getAuthor() != null;
   }
 
   public void reset() {
@@ -52,12 +65,13 @@ public class MergeCommandRequest implements Validateable, Resetable, Serializabl
     final MergeCommandRequest other = (MergeCommandRequest) obj;
 
     return Objects.equal(branchToMerge, other.branchToMerge)
-      && Objects.equal(targetBranch, other.targetBranch);
+      && Objects.equal(targetBranch, other.targetBranch)
+      && Objects.equal(author, other.author);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(branchToMerge, targetBranch);
+    return Objects.hashCode(branchToMerge, targetBranch, author);
   }
 
   @Override
@@ -65,6 +79,7 @@ public class MergeCommandRequest implements Validateable, Resetable, Serializabl
     return MoreObjects.toStringHelper(this)
       .add("branchToMerge", branchToMerge)
       .add("targetBranch", targetBranch)
+      .add("author", author)
       .toString();
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index 800317ef67..8ed3e4961c 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -71,8 +71,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       MergeResult result;
       try {
         result = clone.merge()
-          .setCommit(true)
-          .setMessage(String.format(MERGE_COMMIT_MESSAGE_TEMPLATE, toMerge, target))
+          .setCommit(false) // we want to set the author manually
           .include(toMerge, resolveRevision(toMerge))
           .call();
       } catch (GitAPIException e) {
@@ -80,6 +79,14 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       }
       if (result.getMergeStatus().isSuccessful()) {
         logger.debug("merged branch {} into {}", toMerge, target);
+        try {
+          clone.commit()
+            .setAuthor(request.getAuthor().getName(), request.getAuthor().getMail())
+            .setMessage(String.format(MERGE_COMMIT_MESSAGE_TEMPLATE, toMerge, target))
+            .call();
+        } catch (GitAPIException e) {
+          throw new InternalRepositoryException("could not commit merge between branch " + toMerge + " and " + target, e);
+        }
         try {
           clone.push().call();
         } catch (GitAPIException e) {
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
index c6949a3a11..23b41bf54a 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
@@ -1,9 +1,17 @@
 package sonia.scm.repository.spi;
 
 import org.assertj.core.api.Assertions;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
 import org.junit.Test;
+import sonia.scm.repository.Person;
 import sonia.scm.repository.api.MergeCommandResult;
 
+import java.io.IOException;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 
@@ -34,15 +42,22 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
   }
 
   @Test
-  public void shouldMergeMergeableBranches() {
+  public void shouldMergeMergeableBranches() throws IOException, GitAPIException {
     GitMergeCommand command = createCommand();
     MergeCommandRequest request = new MergeCommandRequest();
     request.setTargetBranch("master");
     request.setBranchToMerge("mergeable");
+    request.setAuthor(new Person("Dirk Gently", "dirk@holistic.det"));
 
     MergeCommandResult mergeCommandResult = command.merge(request);
 
     assertThat(mergeCommandResult.isSuccess()).isTrue();
+
+    Repository repository = createContext().open();
+    Iterable<RevCommit> mergeCommit = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call();
+    PersonIdent mergeAuthor = mergeCommit.iterator().next().getAuthorIdent();
+    assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently");
+    assertThat(mergeAuthor.getEmailAddress()).isEqualTo("dirk@holistic.det");
   }
 
   @Test

From 2f91531d057493c91e9580dfab0fe3297aac30bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 14:04:00 +0100
Subject: [PATCH 141/188] Assert existence of pool directory

---
 .../java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
index d62cd90bbc..f7e409e3bd 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
@@ -24,6 +24,7 @@ public class SimpleGitWorkdirFactory implements GitWorkdirFactory {
 
   public SimpleGitWorkdirFactory(File poolDirectory) {
     this.poolDirectory = poolDirectory;
+    poolDirectory.mkdirs();
   }
 
   public WorkingCopy createWorkingCopy(GitContext gitContext) {
@@ -33,7 +34,7 @@ public class SimpleGitWorkdirFactory implements GitWorkdirFactory {
     } catch (GitAPIException e) {
       throw new InternalRepositoryException("could not clone working copy of repository", e);
     } catch (IOException e) {
-      throw new InternalRepositoryException("could not create temporary directory for copy of repository", e);
+      throw new InternalRepositoryException("could not create temporary directory for clone of repository", e);
     }
   }
 

From 2adebd7ca0353b4a72d77a446a17546d2d101ae5 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 7 Nov 2018 13:46:22 +0000
Subject: [PATCH 142/188] Close branch feature/git-config


From 9ec09c10d58f3521a912dfe413fb0dba2f9e16eb Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 7 Nov 2018 13:47:24 +0000
Subject: [PATCH 143/188] Close branch feature/fix_error_display_for_repo_edit


From 7127cc4cda2443d56ba89d627f8897331c6480af Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 7 Nov 2018 13:54:23 +0000
Subject: [PATCH 144/188] Close branch feature/diff_two_revisions


From 291e6115f94cb56d8739514650584a33f2d82b28 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 7 Nov 2018 14:07:50 +0000
Subject: [PATCH 145/188] Close branch feature/log_two_revisions


From f7348d8882d30e34ea395e00d76db98daa5f4058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 16:10:32 +0100
Subject: [PATCH 146/188] Incorporate comments from peer review

---
 .../AbstractSimpleRepositoryHandler.java      |  6 ++--
 .../InternalRepositoryException.java          |  4 +++
 .../api/RepositoryServiceFactory.java         | 32 +++++++++++++++++++
 .../resources/ChangesetRootResourceTest.java  |  6 +---
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
index 6cfa08975e..d190935fae 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
@@ -89,7 +89,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
       throw new AlreadyExistsException(repository);
     }
 
-    checkPath(directory);
+    checkPath(directory, repository);
 
     try {
       fileSystem.create(directory);
@@ -259,7 +259,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
    * @param directory repository target directory
    * @throws RuntimeException when the parent directory already is a repository
    */
-  private void checkPath(File directory) {
+  private void checkPath(File directory, Repository repository) {
     File repositoryDirectory = config.getRepositoryDirectory();
     File parent = directory.getParentFile();
 
@@ -267,7 +267,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
       logger.trace("check {} for existing repository", parent);
 
       if (isRepository(parent)) {
-        throw new RuntimeException("parent path " + parent + " is a repository");
+        throw new InternalRepositoryException(repository, "parent path " + parent + " is a repository");
       }
 
       parent = parent.getParentFile();
diff --git a/scm-core/src/main/java/sonia/scm/repository/InternalRepositoryException.java b/scm-core/src/main/java/sonia/scm/repository/InternalRepositoryException.java
index 76485daf56..c53ae32750 100644
--- a/scm-core/src/main/java/sonia/scm/repository/InternalRepositoryException.java
+++ b/scm-core/src/main/java/sonia/scm/repository/InternalRepositoryException.java
@@ -15,6 +15,10 @@ public class InternalRepositoryException extends ExceptionWithContext {
     this(context.build(), message, cause);
   }
 
+  public InternalRepositoryException(Repository repository, String message) {
+    this(ContextEntry.ContextBuilder.entity(repository), message, null);
+  }
+
   public InternalRepositoryException(Repository repository, String message, Exception cause) {
     this(ContextEntry.ContextBuilder.entity(repository), message, cause);
   }
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
index d57a965a38..8db3ab7546 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
@@ -38,6 +38,7 @@ package sonia.scm.repository.api;
 import com.github.legman.ReferenceType;
 import com.github.legman.Subscribe;
 import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -154,6 +155,37 @@ public final class RepositoryServiceFactory
 
   //~--- methods --------------------------------------------------------------
 
+  /**
+   * Creates a new RepositoryService for the given repository.
+   *
+   *
+   * @param repositoryId id of the repository
+   *
+   * @return a implementation of RepositoryService
+   *         for the given type of repository
+   *
+   * @throws NotFoundException if no repository
+   *         with the given id is available
+   * @throws RepositoryServiceNotFoundException if no repository service
+   *         implementation for this kind of repository is available
+   * @throws IllegalArgumentException if the repository id is null or empty
+   * @throws ScmSecurityException if current user has not read permissions
+   *         for that repository
+   */
+  public RepositoryService create(String repositoryId) {
+    Preconditions.checkArgument(!Strings.isNullOrEmpty(repositoryId),
+      "a non empty repositoryId is required");
+
+    Repository repository = repositoryManager.get(repositoryId);
+
+    if (repository == null)
+    {
+      throw new NotFoundException(Repository.class, repositoryId);
+    }
+
+    return create(repository);
+  }
+
   /**
    * Creates a new RepositoryService for the given repository.
    *
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
index 998e697d15..d5c0f91f81 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
@@ -9,7 +9,6 @@ import org.apache.shiro.util.ThreadContext;
 import org.apache.shiro.util.ThreadState;
 import org.assertj.core.util.Lists;
 import org.jboss.resteasy.core.Dispatcher;
-import org.jboss.resteasy.mock.MockDispatcherFactory;
 import org.jboss.resteasy.mock.MockHttpRequest;
 import org.jboss.resteasy.mock.MockHttpResponse;
 import org.junit.After;
@@ -19,8 +18,6 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import sonia.scm.api.rest.AuthorizationExceptionMapper;
-import sonia.scm.api.v2.NotFoundExceptionMapper;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.NamespaceAndName;
@@ -39,7 +36,6 @@ import java.util.List;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -79,7 +75,7 @@ public class ChangesetRootResourceTest extends RepositoryTestBase {
 
 
   @Before
-  public void prepareEnvironment() throws Exception {
+  public void prepareEnvironment() {
     changesetCollectionToDtoMapper = new ChangesetCollectionToDtoMapper(changesetToChangesetDtoMapper, resourceLinks);
     changesetRootResource = new ChangesetRootResource(serviceFactory, changesetCollectionToDtoMapper, changesetToChangesetDtoMapper);
     super.changesetRootResource = Providers.of(changesetRootResource);

From 5bbb4c5267738a406bae799d51c67f7d78736967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 16:36:54 +0100
Subject: [PATCH 147/188] Use reflection for parameter validation messages

---
 pom.xml                                       |  3 +-
 .../v2/resources/GroupCollectionResource.java |  8 ++---
 .../scm/api/v2/resources/GroupResource.java   |  6 ++--
 .../scm/api/v2/resources/MeResource.java      |  4 +--
 .../v2/resources/PermissionRootResource.java  |  4 +--
 .../RepositoryCollectionResource.java         |  8 ++---
 .../api/v2/resources/RepositoryResource.java  |  6 ++--
 .../ResourceParameterNameProvider.java        | 29 -------------------
 .../v2/resources/UserCollectionResource.java  |  6 ++--
 .../scm/api/v2/resources/UserResource.java    | 12 ++++----
 .../main/resources/META-INF/validation.xml    | 13 +++------
 11 files changed, 33 insertions(+), 66 deletions(-)
 delete mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceParameterNameProvider.java

diff --git a/pom.xml b/pom.xml
index 383ed6186d..73a2e4e0bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -485,6 +485,7 @@
           see https://blogs.oracle.com/darcy/entry/bootclasspath_older_source
           -->
           <compilerArgument>-Xlint:unchecked,-options</compilerArgument>
+          <compilerArgument>-parameters</compilerArgument>
         </configuration>
       </plugin>
 
@@ -757,7 +758,7 @@
     <guice.version>4.0</guice.version>
 
     <!-- event bus -->
-    <legman.version>1.4.0</legman.version>
+    <legman.version>1.4.1</legman.version>
 
     <!-- webserver -->
     <jetty.version>9.2.10.v20150310</jetty.version>
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
index 0683a1d17b..d9e797e975 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
@@ -71,7 +71,7 @@ public class GroupCollectionResource {
 
   /**
    * Creates a new group.
-   * @param groupDto The group to be created.
+   * @param group The group to be created.
    * @return A response with the link to the new group (if created successfully).
    */
   @POST
@@ -86,9 +86,9 @@ public class GroupCollectionResource {
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   @ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created group"))
-  public Response create(@Valid @Named("group") GroupDto groupDto) {
-    return adapter.create(groupDto,
-                          () -> dtoToGroupMapper.map(groupDto),
+  public Response create(@Valid GroupDto group) {
+    return adapter.create(group,
+                          () -> dtoToGroupMapper.map(group),
                           group -> resourceLinks.group().self(group.getName()));
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java
index 88954212f6..6d0b921d02 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupResource.java
@@ -83,7 +83,7 @@ public class GroupResource {
    * <strong>Note:</strong> This method requires "group" privilege.
    *
    * @param name name of the group to be modified
-   * @param groupDto group object to modify
+   * @param group group object to modify
    */
   @PUT
   @Path("")
@@ -97,7 +97,7 @@ public class GroupResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
-  public Response update(@PathParam("id") String name, @Valid @Named("group") GroupDto groupDto) {
-    return adapter.update(name, existing -> dtoToGroupMapper.map(groupDto));
+  public Response update(@PathParam("id") String name, @Valid GroupDto group) {
+    return adapter.update(name, existing -> dtoToGroupMapper.map(group));
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeResource.java
index 62917da8b0..20fc35923c 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeResource.java
@@ -74,8 +74,8 @@ public class MeResource {
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   @Consumes(VndMediaType.PASSWORD_CHANGE)
-  public Response changePassword(@Valid @Named("passwordChange") PasswordChangeDto passwordChangeDto) {
-    userManager.changePasswordForLoggedInUser(passwordService.encryptPassword(passwordChangeDto.getOldPassword()), passwordService.encryptPassword(passwordChangeDto.getNewPassword()));
+  public Response changePassword(@Valid PasswordChangeDto passwordChange) {
+    userManager.changePasswordForLoggedInUser(passwordService.encryptPassword(passwordChange.getOldPassword()), passwordService.encryptPassword(passwordChange.getNewPassword()));
     return Response.noContent().build();
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
index 9359746f1e..9335e2b2df 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
@@ -74,7 +74,7 @@ public class PermissionRootResource {
   @TypeHint(TypeHint.NO_CONTENT.class)
   @Consumes(VndMediaType.PERMISSION)
   @Path("")
-  public Response create(@PathParam("namespace") String namespace, @PathParam("name") String name,@Valid @Named("permission") PermissionDto permission) {
+  public Response create(@PathParam("namespace") String namespace, @PathParam("name") String name,@Valid PermissionDto permission) {
     log.info("try to add new permission: {}", permission);
     Repository repository = load(namespace, name);
     RepositoryPermissions.permissionWrite(repository).check();
@@ -161,7 +161,7 @@ public class PermissionRootResource {
   public Response update(@PathParam("namespace") String namespace,
                          @PathParam("name") String name,
                          @PathParam("permission-name") String permissionName,
-                         @Valid @Named("permission") PermissionDto permission) {
+                         @Valid PermissionDto permission) {
     log.info("try to update the permission with name: {}. the modified permission is: {}", permissionName, permission);
     Repository repository = load(namespace, name);
     RepositoryPermissions.permissionWrite(repository).check();
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
index d109714ebe..13f3fcb9f7 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
@@ -72,7 +72,7 @@ public class RepositoryCollectionResource {
    * <strong>Note:</strong> This method requires "repository" privilege. The namespace of the given repository will
    *   be ignored and set by the configured namespace strategy.
    *
-   * @param repositoryDto The repository to be created.
+   * @param repository The repository to be created.
    * @return A response with the link to the new repository (if created successfully).
    */
   @POST
@@ -87,9 +87,9 @@ public class RepositoryCollectionResource {
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   @ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created repository"))
-  public Response create(@Valid @Named("repository") RepositoryDto repositoryDto) {
-    return adapter.create(repositoryDto,
-      () -> dtoToRepositoryMapper.map(repositoryDto, null),
+  public Response create(@Valid RepositoryDto repository) {
+    return adapter.create(repository,
+      () -> dtoToRepositoryMapper.map(repository, null),
       repository -> resourceLinks.repository().self(repository.getNamespace(), repository.getName()));
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
index 75615784ba..f65235db0b 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java
@@ -126,7 +126,7 @@ public class RepositoryResource {
    *
    * @param namespace the namespace of the repository to be modified
    * @param name the name of the repository to be modified
-   * @param repositoryDto repository object to modify
+   * @param repository repository object to modify
    */
   @PUT
   @Path("")
@@ -140,10 +140,10 @@ public class RepositoryResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
-  public Response update(@PathParam("namespace") String namespace, @PathParam("name") String name, @Valid @Named("repository") RepositoryDto repositoryDto) {
+  public Response update(@PathParam("namespace") String namespace, @PathParam("name") String name, @Valid RepositoryDto repository) {
     return adapter.update(
       loadBy(namespace, name),
-      existing -> processUpdate(repositoryDto, existing),
+      existing -> processUpdate(repository, existing),
       nameAndNamespaceStaysTheSame(namespace, name)
     );
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceParameterNameProvider.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceParameterNameProvider.java
deleted file mode 100644
index 986a3ca652..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceParameterNameProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package sonia.scm.api.v2.resources;
-
-import javax.inject.Named;
-import javax.validation.ParameterNameProvider;
-import javax.ws.rs.ext.Provider;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-@Provider
-public class ResourceParameterNameProvider implements ParameterNameProvider {
-  @Override
-  public List<String> getParameterNames(Constructor<?> constructor) {
-    return Arrays.stream(constructor.getParameters()).map(this::getParameterName).collect(Collectors.toList());
-  }
-
-  @Override
-  public List<String> getParameterNames(Method method) {
-    return Arrays.stream(method.getParameters()).map(this::getParameterName).collect(Collectors.toList());
-  }
-
-  private String getParameterName(Parameter parameter) {
-    return Optional.ofNullable(parameter.getAnnotation(Named.class)).map(Named::value).orElse(parameter.getName());
-  }
-}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
index c19e6b35ba..9a78051353 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
@@ -76,7 +76,7 @@ public class UserCollectionResource {
    *
    * <strong>Note:</strong> This method requires "user" privilege.
    *
-   * @param userDto The user to be created.
+   * @param user The user to be created.
    * @return A response with the link to the new user (if created successfully).
    */
   @POST
@@ -91,7 +91,7 @@ public class UserCollectionResource {
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   @ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created user"))
-  public Response create(@Valid @Named("user") UserDto userDto) {
-    return adapter.create(userDto, () -> dtoToUserMapper.map(userDto, passwordService.encryptPassword(userDto.getPassword())), user -> resourceLinks.user().self(user.getName()));
+  public Response create(@Valid UserDto user) {
+    return adapter.create(user, () -> dtoToUserMapper.map(user, passwordService.encryptPassword(user.getPassword())), user -> resourceLinks.user().self(user.getName()));
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
index 565cc48eb9..0076d057ca 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
@@ -87,7 +87,7 @@ public class UserResource {
    * <strong>Note:</strong> This method requires "user" privilege.
    *
    * @param name    name of the user to be modified
-   * @param userDto user object to modify
+   * @param user user object to modify
    */
   @PUT
   @Path("")
@@ -101,8 +101,8 @@ public class UserResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
-  public Response update(@PathParam("id") String name, @Valid @Named("user") UserDto userDto) {
-    return adapter.update(name, existing -> dtoToUserMapper.map(userDto, existing.getPassword()));
+  public Response update(@PathParam("id") String name, @Valid UserDto user) {
+    return adapter.update(name, existing -> dtoToUserMapper.map(user, existing.getPassword()));
   }
 
   /**
@@ -114,7 +114,7 @@ public class UserResource {
    * <strong>Note:</strong> This method requires "user:changeOwnPassword" privilege to modify the own password.
    *
    * @param name              name of the user to be modified
-   * @param passwordOverwriteDto change password object to modify password. the old password is here not required
+   * @param passwordOverwrite change password object to modify password. the old password is here not required
    */
   @PUT
   @Path("password")
@@ -128,8 +128,8 @@ public class UserResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
-  public Response overwritePassword(@PathParam("id") String name, @Valid @Named("passwordChange") PasswordOverwriteDto passwordOverwriteDto) {
-    userManager.overwritePassword(name, passwordService.encryptPassword(passwordOverwriteDto.getNewPassword()));
+  public Response overwritePassword(@PathParam("id") String name, @Valid PasswordOverwriteDto passwordOverwrite) {
+    userManager.overwritePassword(name, passwordService.encryptPassword(passwordOverwrite.getNewPassword()));
     return Response.noContent().build();
   }
 }
diff --git a/scm-webapp/src/main/resources/META-INF/validation.xml b/scm-webapp/src/main/resources/META-INF/validation.xml
index b6feda4713..337bbff26e 100644
--- a/scm-webapp/src/main/resources/META-INF/validation.xml
+++ b/scm-webapp/src/main/resources/META-INF/validation.xml
@@ -1,14 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <validation-config
   xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="
-                    http://jboss.org/xml/ns/javax/validation/configuration
-                    validation-configuration-1.1.xsd"
+  xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration"
   version="1.1">
-  <default-provider>org.hibernate.validator.HibernateValidator</default-provider>
-  <message-interpolator>org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator</message-interpolator>
-  <traversable-resolver>org.hibernate.validator.internal.engine.resolver.DefaultTraversableResolver</traversable-resolver>
-  <constraint-validator-factory>org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorFactoryImpl</constraint-validator-factory>
-  <parameter-name-provider>sonia.scm.api.v2.resources.ResourceParameterNameProvider</parameter-name-provider>
+
+  <parameter-name-provider>org.hibernate.validator.parameternameprovider.ReflectionParameterNameProvider</parameter-name-provider>
+
 </validation-config>

From c1b6f64ecf43aecf8edeb927a6d1ea2dae5cd2e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 7 Nov 2018 17:39:56 +0100
Subject: [PATCH 148/188] Fix build breaker

---
 pom.xml                                                         | 2 +-
 .../sonia/scm/api/v2/resources/GroupCollectionResource.java     | 2 +-
 .../scm/api/v2/resources/RepositoryCollectionResource.java      | 2 +-
 .../java/sonia/scm/api/v2/resources/UserCollectionResource.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73a2e4e0bb..e0e4646e9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -758,7 +758,7 @@
     <guice.version>4.0</guice.version>
 
     <!-- event bus -->
-    <legman.version>1.4.1</legman.version>
+    <legman.version>1.4.2</legman.version>
 
     <!-- webserver -->
     <jetty.version>9.2.10.v20150310</jetty.version>
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
index d9e797e975..4c111e6707 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
@@ -89,6 +89,6 @@ public class GroupCollectionResource {
   public Response create(@Valid GroupDto group) {
     return adapter.create(group,
                           () -> dtoToGroupMapper.map(group),
-                          group -> resourceLinks.group().self(group.getName()));
+                          g -> resourceLinks.group().self(g.getName()));
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
index 13f3fcb9f7..ad9c29f14e 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
@@ -90,6 +90,6 @@ public class RepositoryCollectionResource {
   public Response create(@Valid RepositoryDto repository) {
     return adapter.create(repository,
       () -> dtoToRepositoryMapper.map(repository, null),
-      repository -> resourceLinks.repository().self(repository.getNamespace(), repository.getName()));
+      r -> resourceLinks.repository().self(r.getNamespace(), r.getName()));
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
index 9a78051353..a4fe9adb94 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
@@ -92,6 +92,6 @@ public class UserCollectionResource {
   @TypeHint(TypeHint.NO_CONTENT.class)
   @ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created user"))
   public Response create(@Valid UserDto user) {
-    return adapter.create(user, () -> dtoToUserMapper.map(user, passwordService.encryptPassword(user.getPassword())), user -> resourceLinks.user().self(user.getName()));
+    return adapter.create(user, () -> dtoToUserMapper.map(user, passwordService.encryptPassword(user.getPassword())), u -> resourceLinks.user().self(u.getName()));
   }
 }

From 0714d5f96036133133ed81833c2498dc3e204273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 8 Nov 2018 09:32:43 +0100
Subject: [PATCH 149/188] Extract methods to emphasize flow

---
 .../scm/repository/spi/GitMergeCommand.java   | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index 8ed3e4961c..e97b9a85e3 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -11,6 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.repository.GitWorkdirFactory;
 import sonia.scm.repository.InternalRepositoryException;
+import sonia.scm.repository.Person;
 import sonia.scm.repository.api.MergeCommandResult;
 import sonia.scm.repository.api.MergeDryRunCommandResult;
 
@@ -36,7 +37,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
     try (WorkingCopy workingCopy = workdirFactory.createWorkingCopy(context)) {
       Repository repository = workingCopy.get();
       logger.debug("cloned repository to folder {}", repository.getWorkTree());
-      return new MergeWorker(repository).merge(request);
+      return new MergeWorker(repository, request).merge();
     } catch (IOException e) {
       throw new InternalRepositoryException("could not clone repository for merge", e);
     }
@@ -55,19 +56,32 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
 
   private static class MergeWorker {
 
+    private final String target;
+    private final String toMerge;
+    private final Person author;
     private final Git clone;
-    private MergeWorker(Repository clone) {
+    private MergeWorker(Repository clone, MergeCommandRequest request) {
+      this.target = request.getTargetBranch();
+      this.toMerge = request.getBranchToMerge();
+      this.author = request.getAuthor();
       this.clone = new Git(clone);
     }
 
-    private MergeCommandResult merge(MergeCommandRequest request) throws IOException {
-      String target = request.getTargetBranch();
-      String toMerge = request.getBranchToMerge();
+    private MergeCommandResult merge() throws IOException {
+      createClone();
+      MergeResult result = doMergeInClone();
+      return analyzeResult(result);
+    }
+
+    private void createClone() {
       try {
         clone.checkout().setName(target).call();
       } catch (GitAPIException e) {
         throw new InternalRepositoryException("could not checkout target branch for merge: " + target, e);
       }
+    }
+
+    private MergeResult doMergeInClone() throws IOException {
       MergeResult result;
       try {
         result = clone.merge()
@@ -77,11 +91,15 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       } catch (GitAPIException e) {
         throw new InternalRepositoryException("could not merge branch " + toMerge + " into " + target, e);
       }
+      return result;
+    }
+
+    private MergeCommandResult analyzeResult(MergeResult result) {
       if (result.getMergeStatus().isSuccessful()) {
         logger.debug("merged branch {} into {}", toMerge, target);
         try {
           clone.commit()
-            .setAuthor(request.getAuthor().getName(), request.getAuthor().getMail())
+            .setAuthor(author.getName(), author.getMail())
             .setMessage(String.format(MERGE_COMMIT_MESSAGE_TEMPLATE, toMerge, target))
             .call();
         } catch (GitAPIException e) {

From 5ca8d4d0491b3c5d8cad4a0068f14e4d93975fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 8 Nov 2018 09:53:35 +0100
Subject: [PATCH 150/188] Extract methods to emphasize flow

---
 .../scm/repository/spi/GitMergeCommand.java   | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index e97b9a85e3..50b9636dc2 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -60,6 +60,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
     private final String toMerge;
     private final Person author;
     private final Git clone;
+
     private MergeWorker(Repository clone, MergeCommandRequest request) {
       this.target = request.getTargetBranch();
       this.toMerge = request.getBranchToMerge();
@@ -70,7 +71,13 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
     private MergeCommandResult merge() throws IOException {
       createClone();
       MergeResult result = doMergeInClone();
-      return analyzeResult(result);
+      if (result.getMergeStatus().isSuccessful()) {
+        doCommit();
+        push();
+        return MergeCommandResult.success();
+      } else {
+        return analyseFailure(result);
+      }
     }
 
     private void createClone() {
@@ -94,30 +101,32 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       return result;
     }
 
-    private MergeCommandResult analyzeResult(MergeResult result) {
-      if (result.getMergeStatus().isSuccessful()) {
-        logger.debug("merged branch {} into {}", toMerge, target);
-        try {
-          clone.commit()
-            .setAuthor(author.getName(), author.getMail())
-            .setMessage(String.format(MERGE_COMMIT_MESSAGE_TEMPLATE, toMerge, target))
-            .call();
-        } catch (GitAPIException e) {
-          throw new InternalRepositoryException("could not commit merge between branch " + toMerge + " and " + target, e);
-        }
-        try {
-          clone.push().call();
-        } catch (GitAPIException e) {
-          throw new InternalRepositoryException("could not push merged branch " + toMerge + " to origin", e);
-        }
-        logger.debug("pushed merged branch {}", target);
-        return MergeCommandResult.success();
-      } else {
-        logger.info("could not merged branch {} into {} due to conflict in paths {}", toMerge, target, result.getConflicts().keySet());
-        return MergeCommandResult.failure(result.getConflicts().keySet());
+    private void doCommit() {
+      logger.debug("merged branch {} into {}", toMerge, target);
+      try {
+        clone.commit()
+          .setAuthor(author.getName(), author.getMail())
+          .setMessage(String.format(MERGE_COMMIT_MESSAGE_TEMPLATE, toMerge, target))
+          .call();
+      } catch (GitAPIException e) {
+        throw new InternalRepositoryException("could not commit merge between branch " + toMerge + " and " + target, e);
       }
     }
 
+    private void push() {
+      try {
+        clone.push().call();
+      } catch (GitAPIException e) {
+        throw new InternalRepositoryException("could not push merged branch " + toMerge + " to origin", e);
+      }
+      logger.debug("pushed merged branch {}", target);
+    }
+
+    private MergeCommandResult analyseFailure(MergeResult result) {
+      logger.info("could not merged branch {} into {} due to conflict in paths {}", toMerge, target, result.getConflicts().keySet());
+      return MergeCommandResult.failure(result.getConflicts().keySet());
+    }
+
     private ObjectId resolveRevision(String branchToMerge) throws IOException {
       ObjectId resolved = clone.getRepository().resolve(branchToMerge);
       if (resolved == null) {

From 6f7aa24700f55936d51a7bc0775cb16b597aec23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 8 Nov 2018 10:00:21 +0100
Subject: [PATCH 151/188] Use jav nio to create temp directory

---
 .../sonia/scm/repository/spi/SimpleGitWorkdirFactory.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
index f7e409e3bd..a8a54d3c0c 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
@@ -11,6 +11,7 @@ import sonia.scm.repository.InternalRepositoryException;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 
 public class SimpleGitWorkdirFactory implements GitWorkdirFactory {
 
@@ -39,10 +40,7 @@ public class SimpleGitWorkdirFactory implements GitWorkdirFactory {
   }
 
   private File createNewWorkdir() throws IOException {
-    File workdir = File.createTempFile("workdir", "", poolDirectory);
-    workdir.delete();
-    workdir.mkdir();
-    return workdir;
+    return Files.createTempDirectory(poolDirectory.toPath(),"workdir").toFile();
   }
 
   protected Repository cloneRepository(File bareRepository, File target) throws GitAPIException {

From 72619946a4403264169af688a113515264c5aa32 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 8 Nov 2018 09:36:18 +0000
Subject: [PATCH 152/188] Close branch feature/errorhandling


From 792ae31f286aac613771fa91680e78e091b28fd6 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 8 Nov 2018 09:37:36 +0000
Subject: [PATCH 153/188] Close branch feature/validation_reflection


From 720862296ef66768015f4b2459abb75e6fb7643f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 8 Nov 2018 13:30:05 +0100
Subject: [PATCH 154/188] Use logged in user for author as default

---
 .../repository/spi/MergeCommandRequest.java   |  3 +-
 .../scm/repository/spi/GitMergeCommand.java   | 19 +++++++++-
 .../repository/spi/GitMergeCommandTest.java   | 37 ++++++++++++++++++-
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java b/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java
index a4e22b5ad1..05f160ec0a 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java
@@ -43,8 +43,7 @@ public class MergeCommandRequest implements Validateable, Resetable, Serializabl
 
   public boolean isValid() {
     return !Strings.isNullOrEmpty(getBranchToMerge())
-      && !Strings.isNullOrEmpty(getTargetBranch())
-      && getAuthor() != null;
+      && !Strings.isNullOrEmpty(getTargetBranch());
   }
 
   public void reset() {
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index 50b9636dc2..a060c0fecc 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -1,5 +1,7 @@
 package sonia.scm.repository.spi;
 
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.MergeResult;
 import org.eclipse.jgit.api.errors.GitAPIException;
@@ -14,6 +16,7 @@ import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.api.MergeCommandResult;
 import sonia.scm.repository.api.MergeDryRunCommandResult;
+import sonia.scm.user.User;
 
 import java.io.IOException;
 
@@ -103,9 +106,10 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
 
     private void doCommit() {
       logger.debug("merged branch {} into {}", toMerge, target);
+      Person authorToUse = determineAuthor();
       try {
         clone.commit()
-          .setAuthor(author.getName(), author.getMail())
+          .setAuthor(authorToUse.getName(), authorToUse.getMail())
           .setMessage(String.format(MERGE_COMMIT_MESSAGE_TEMPLATE, toMerge, target))
           .call();
       } catch (GitAPIException e) {
@@ -113,6 +117,19 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       }
     }
 
+    private Person determineAuthor() {
+      if (author == null) {
+        Subject subject = SecurityUtils.getSubject();
+        User user = subject.getPrincipals().oneByType(User.class);
+        String name = user.getDisplayName();
+        String email = user.getMail();
+        logger.debug("no author set; using logged in user: {} <{}>", name, email);
+        return new Person(name, email);
+      } else {
+        return author;
+      }
+    }
+
     private void push() {
       try {
         clone.push().call();
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
index 23b41bf54a..307416011e 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
@@ -1,22 +1,32 @@
 package sonia.scm.repository.spi;
 
-import org.assertj.core.api.Assertions;
+import com.github.sdorra.shiro.ShiroRule;
+import com.github.sdorra.shiro.SubjectAware;
+import org.apache.shiro.subject.SimplePrincipalCollection;
+import org.apache.shiro.subject.Subject;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
+import org.junit.Rule;
 import org.junit.Test;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.api.MergeCommandResult;
+import sonia.scm.user.User;
 
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
+@SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini")
 public class GitMergeCommandTest extends AbstractGitCommandTestBase {
 
+  private static final String REALM = "AdminRealm";
+
+  @Rule
+  public ShiroRule shiro = new ShiroRule();
+
   @Test
   public void shouldDetectMergeableBranches() {
     GitMergeCommand command = createCommand();
@@ -73,6 +83,29 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
     assertThat(mergeCommandResult.getFilesWithConflict()).containsExactly("a.txt");
   }
 
+  @Test
+  @SubjectAware(username = "admin", password = "secret")
+  public void shouldTakeAuthorFromSubjectIfNotSet() throws IOException, GitAPIException {
+    shiro.setSubject(
+      new Subject.Builder()
+        .principals(new SimplePrincipalCollection(new User("dirk", "Dirk Gently", "dirk@holistic.det"), REALM))
+        .buildSubject());
+    GitMergeCommand command = createCommand();
+    MergeCommandRequest request = new MergeCommandRequest();
+    request.setTargetBranch("master");
+    request.setBranchToMerge("mergeable");
+
+    MergeCommandResult mergeCommandResult = command.merge(request);
+
+    assertThat(mergeCommandResult.isSuccess()).isTrue();
+
+    Repository repository = createContext().open();
+    Iterable<RevCommit> mergeCommit = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call();
+    PersonIdent mergeAuthor = mergeCommit.iterator().next().getAuthorIdent();
+    assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently");
+    assertThat(mergeAuthor.getEmailAddress()).isEqualTo("dirk@holistic.det");
+  }
+
   private GitMergeCommand createCommand() {
     return new GitMergeCommand(createContext(), repository, new SimpleGitWorkdirFactory());
   }

From 42f0632a23305b8e707056af652ae177cad9f118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 8 Nov 2018 14:03:09 +0100
Subject: [PATCH 155/188] Add check for merged file to unit test

---
 .../sonia/scm/repository/spi/GitMergeCommandTest.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
index 307416011e..5bb9af7d8f 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
@@ -64,10 +64,15 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
     assertThat(mergeCommandResult.isSuccess()).isTrue();
 
     Repository repository = createContext().open();
-    Iterable<RevCommit> mergeCommit = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call();
-    PersonIdent mergeAuthor = mergeCommit.iterator().next().getAuthorIdent();
+    Iterable<RevCommit> commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call();
+    RevCommit mergeCommit = commits.iterator().next();
+    PersonIdent mergeAuthor = mergeCommit.getAuthorIdent();
     assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently");
     assertThat(mergeAuthor.getEmailAddress()).isEqualTo("dirk@holistic.det");
+    // We expect the merge result of file b.txt here by looking up the sha hash of its content.
+    // If the file is missing (aka not merged correctly) this will throw a MissingObjectException:
+    byte[] contentOfFileB = repository.open(repository.resolve("9513e9c76e73f3e562fd8e4c909d0607113c77c6")).getBytes();
+    assertThat(new String(contentOfFileB)).isEqualTo("b\ncontent from branch\n");
   }
 
   @Test

From 3c70ca7aa5d001e78c4a3ad737b4a66d97b96818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 8 Nov 2018 14:35:35 +0100
Subject: [PATCH 156/188] Add JavaDoc for API

---
 .../repository/api/MergeCommandBuilder.java   | 80 ++++++++++++++++++-
 .../repository/api/MergeCommandResult.java    | 13 +++
 .../api/MergeDryRunCommandResult.java         |  8 ++
 3 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
index 00acb66874..3823b2b3a7 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
@@ -5,40 +5,118 @@ import sonia.scm.repository.Person;
 import sonia.scm.repository.spi.MergeCommand;
 import sonia.scm.repository.spi.MergeCommandRequest;
 
+/**
+ * Use this {@link MergeCommandBuilder} to merge two branches of a repository ({@link #executeMerge()}) or to check if
+ * the branches could be merged without conflicts ({@link #dryRun()}). To do so, you have to specify the name of
+ * the target branch ({@link #setTargetBranch(String)}) and the name of the branch that should be merged
+ * ({@link #setBranchToMerge(String)}). Additionally you can specify an author that should be used for the commit
+ * ({@link #setAuthor(Person)}) if you are not doing a dry run only. If no author is specified, the logged in user
+ * will be used instead.
+ *
+ * To actually merge <code>feature_branch</code> into <code>integration_branch</code> do this:
+ * <pre><code>
+ *     repositoryService.gerMergeCommand()
+ *       .setBranchToMerge("feature_branch")
+ *       .setTargetBranch("integration_branch")
+ *       .executeMerge();
+ * </code></pre>
+ *
+ * If the merge is successful, the result will look like this:
+ * <pre><code>
+ *                            O    <- Merge result (new head of integration_branch)
+ *                            |\
+ *                            | \
+ *  old integration_branch -> O  O <- feature_branch
+ *                            |  |
+ *                            O  O
+ * </code></pre>
+ *
+ * To check whether they can be merged without conflicts beforehand do this:
+ * <pre><code>
+ *     repositoryService.gerMergeCommand()
+ *       .setBranchToMerge("feature_branch")
+ *       .setTargetBranch("integration_branch")
+ *       .dryRun()
+ *       .isMergeable();
+ * </code></pre>
+ *
+ * Keep in mind that you should <em>always</em> check the result of a merge even though you may have done a dry run
+ * beforehand, because the branches can change between the dry run and the actual merge.
+ *
+ * @since 2.0.0
+ */
 public class MergeCommandBuilder {
 
   private final MergeCommand mergeCommand;
   private final MergeCommandRequest request = new MergeCommandRequest();
 
-  public MergeCommandBuilder(MergeCommand mergeCommand) {
+  MergeCommandBuilder(MergeCommand mergeCommand) {
     this.mergeCommand = mergeCommand;
   }
 
+  /**
+   * Use this to set the branch that should be merged into the target branch.
+   *
+   * <b>This is mandatory.</b>
+   *
+   * @return This builder instance.
+   */
   public MergeCommandBuilder setBranchToMerge(String branchToMerge) {
     request.setBranchToMerge(branchToMerge);
     return this;
   }
 
+  /**
+   * Use this to set the target branch the other branch should be merged into.
+   *
+   * <b>This is mandatory.</b>
+   *
+   * @return This builder instance.
+   */
   public MergeCommandBuilder setTargetBranch(String targetBranch) {
     request.setTargetBranch(targetBranch);
     return this;
   }
 
+  /**
+   * Use this to set the author of the merge commit manually. If this is omitted, the currently logged in user will be
+   * used instead.
+   *
+   * This is optional and for {@link #executeMerge()} only.
+   *
+   * @return This builder instance.
+   */
   public MergeCommandBuilder setAuthor(Person author) {
     request.setAuthor(author);
     return this;
   }
 
+  /**
+   * Use this to reset the command.
+   * @return This builder instance.
+   */
   public MergeCommandBuilder reset() {
     request.reset();
     return this;
   }
 
+  /**
+   * Use this to actually do the merge. If an automatic merge is not possible, {@link MergeCommandResult#isSuccess()}
+   * will return <code>false</code>.
+   *
+   * @return The result of the merge.
+   */
   public MergeCommandResult executeMerge() {
     Preconditions.checkArgument(request.isValid(), "revision to merge and target revision is required");
     return mergeCommand.merge(request);
   }
 
+  /**
+   * Use this to check whether the given branches can be merged autmatically. If this is possible,
+   * {@link MergeDryRunCommandResult#isMergeable()} will return <code>true</code>.
+   *
+   * @return The result whether the given branches can be merged automatically.
+   */
   public MergeDryRunCommandResult dryRun() {
     Preconditions.checkArgument(request.isValid(), "revision to merge and target revision is required");
     return mergeCommand.dryRun(request);
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java
index c5a4a57d42..53f712cddc 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java
@@ -6,6 +6,11 @@ import java.util.HashSet;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableCollection;
 
+/**
+ * This class keeps the result of a merge of branches. Use {@link #isSuccess()} to check whether the merge was
+ * sucessfully executed. If the result is <code>false</code> the merge could not be done without conflicts. In this
+ * case you can use {@link #getFilesWithConflict()} to get a list of files with merge conflicts.
+ */
 public class MergeCommandResult {
   private final Collection<String> filesWithConflict;
 
@@ -21,10 +26,18 @@ public class MergeCommandResult {
     return new MergeCommandResult(new HashSet<>(filesWithConflict));
   }
 
+  /**
+   * If this returns <code>true</code>, the merge was successfull. If this returns <code>false</code> there were
+   * merge conflicts. In this case you can use {@link #getFilesWithConflict()} to check what files could not be merged.
+   */
   public boolean isSuccess() {
     return filesWithConflict.isEmpty();
   }
 
+  /**
+   * If the merge was not successful ({@link #isSuccess()} returns <code>false</code>) this will give you a list of
+   * file paths that could not be merged automatically.
+   */
   public Collection<String> getFilesWithConflict() {
     return unmodifiableCollection(filesWithConflict);
   }
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandResult.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandResult.java
index aeb18a753d..6ebb330aae 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandResult.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeDryRunCommandResult.java
@@ -1,5 +1,9 @@
 package sonia.scm.repository.api;
 
+/**
+ * This class keeps the result of a merge dry run. Use {@link #isMergeable()} to check whether an automatic merge is
+ * possible or not.
+ */
 public class MergeDryRunCommandResult {
 
   private final boolean mergeable;
@@ -8,6 +12,10 @@ public class MergeDryRunCommandResult {
     this.mergeable = mergeable;
   }
 
+  /**
+   * This will return <code>true</code>, when an automatic merge is possible <em>at the moment</em>; <code>false</code>
+   * otherwise.
+   */
   public boolean isMergeable() {
     return mergeable;
   }

From 8d057f774506fc98b225580f7cfd74e9cef008cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 8 Nov 2018 14:37:18 +0100
Subject: [PATCH 157/188] Hide details

---
 .../main/java/sonia/scm/repository/spi/GitMergeCommand.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index a060c0fecc..6376262228 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -23,7 +23,8 @@ import java.io.IOException;
 public class GitMergeCommand extends AbstractGitCommand implements MergeCommand {
 
   private static final Logger logger = LoggerFactory.getLogger(GitMergeCommand.class);
-  public static final String MERGE_COMMIT_MESSAGE_TEMPLATE =
+
+  private static final String MERGE_COMMIT_MESSAGE_TEMPLATE =
     "Merge of branch %s into %s\n" +
     "\n" +
     "Automatic merge by SCM-Manager.";

From 97d158ab3515efe77b74efac9405f98537b075c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 8 Nov 2018 14:39:30 +0100
Subject: [PATCH 158/188] Naming

---
 .../main/java/sonia/scm/repository/spi/GitMergeCommand.java   | 4 ++--
 .../test/java/sonia/scm/repository/CloseableWrapperTest.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index 6376262228..f61038b069 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -73,7 +73,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
     }
 
     private MergeCommandResult merge() throws IOException {
-      createClone();
+      checkOutTargetBranch();
       MergeResult result = doMergeInClone();
       if (result.getMergeStatus().isSuccessful()) {
         doCommit();
@@ -84,7 +84,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       }
     }
 
-    private void createClone() {
+    private void checkOutTargetBranch() {
       try {
         clone.checkout().setName(target).call();
       } catch (GitAPIException e) {
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java
index 34c5e8e7e2..e92ee7abb5 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java
@@ -10,7 +10,7 @@ import static org.mockito.Mockito.verify;
 public class CloseableWrapperTest {
 
   @Test
-  public void x() {
+  public void shouldExecuteGivenMethodAtClose() {
     Consumer<String> wrapped = new Consumer<String>() {
       // no this cannot be replaced with a lambda because otherwise we could not use Mockito#spy
       @Override

From 6bddf9951f5add4e7df03519b4843371d79e6fac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 8 Nov 2018 14:59:00 +0100
Subject: [PATCH 159/188] Make commit message configurable

---
 .../repository/api/MergeCommandBuilder.java   | 23 +++++++++++++++++--
 .../repository/spi/MergeCommandRequest.java   |  9 ++++++++
 .../scm/repository/spi/GitMergeCommand.java   | 22 ++++++++++++++----
 .../repository/spi/GitMergeCommandTest.java   | 22 ++++++++++++++++++
 4 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
index 3823b2b3a7..881a374864 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeCommandBuilder.java
@@ -10,8 +10,8 @@ import sonia.scm.repository.spi.MergeCommandRequest;
  * the branches could be merged without conflicts ({@link #dryRun()}). To do so, you have to specify the name of
  * the target branch ({@link #setTargetBranch(String)}) and the name of the branch that should be merged
  * ({@link #setBranchToMerge(String)}). Additionally you can specify an author that should be used for the commit
- * ({@link #setAuthor(Person)}) if you are not doing a dry run only. If no author is specified, the logged in user
- * will be used instead.
+ * ({@link #setAuthor(Person)}) and a message template ({@link #setMessageTemplate(String)}) if you are not doing a dry
+ * run only. If no author is specified, the logged in user and a default message will be used instead.
  *
  * To actually merge <code>feature_branch</code> into <code>integration_branch</code> do this:
  * <pre><code>
@@ -91,6 +91,25 @@ public class MergeCommandBuilder {
     return this;
   }
 
+  /**
+   * Use this to set a template for the commit message. If no message is set, a default message will be used.
+   *
+   * You can use the placeholder <code>{0}</code> for the branch to be merged and <code>{1}</code> for the target
+   * branch, eg.:
+   *
+   * <pre><code>
+   * ...setMessageTemplate("Merge of {0} into {1}")...
+   * </code></pre>
+   *
+   * This is optional and for {@link #executeMerge()} only.
+   *
+   * @return This builder instance.
+   */
+  public MergeCommandBuilder setMessageTemplate(String messageTemplate) {
+    request.setMessageTemplate(messageTemplate);
+    return this;
+  }
+
   /**
    * Use this to reset the command.
    * @return This builder instance.
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java b/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java
index 05f160ec0a..baf03a0aef 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/MergeCommandRequest.java
@@ -16,6 +16,7 @@ public class MergeCommandRequest implements Validateable, Resetable, Serializabl
   private String branchToMerge;
   private String targetBranch;
   private Person author;
+  private String messageTemplate;
 
   public String getBranchToMerge() {
     return branchToMerge;
@@ -41,6 +42,14 @@ public class MergeCommandRequest implements Validateable, Resetable, Serializabl
     this.author = author;
   }
 
+  public String getMessageTemplate() {
+    return messageTemplate;
+  }
+
+  public void setMessageTemplate(String messageTemplate) {
+    this.messageTemplate = messageTemplate;
+  }
+
   public boolean isValid() {
     return !Strings.isNullOrEmpty(getBranchToMerge())
       && !Strings.isNullOrEmpty(getTargetBranch());
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index f61038b069..05541e8295 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -1,5 +1,6 @@
 package sonia.scm.repository.spi;
 
+import com.google.common.base.Strings;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.eclipse.jgit.api.Git;
@@ -19,15 +20,16 @@ import sonia.scm.repository.api.MergeDryRunCommandResult;
 import sonia.scm.user.User;
 
 import java.io.IOException;
+import java.text.MessageFormat;
 
 public class GitMergeCommand extends AbstractGitCommand implements MergeCommand {
 
   private static final Logger logger = LoggerFactory.getLogger(GitMergeCommand.class);
 
-  private static final String MERGE_COMMIT_MESSAGE_TEMPLATE =
-    "Merge of branch %s into %s\n" +
-    "\n" +
-    "Automatic merge by SCM-Manager.";
+  private static final String MERGE_COMMIT_MESSAGE_TEMPLATE = String.join("\n",
+    "Merge of branch {0} into {1}",
+    "",
+    "Automatic merge by SCM-Manager.");
 
   private final GitWorkdirFactory workdirFactory;
 
@@ -64,11 +66,13 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
     private final String toMerge;
     private final Person author;
     private final Git clone;
+    private final String messageTemplate;
 
     private MergeWorker(Repository clone, MergeCommandRequest request) {
       this.target = request.getTargetBranch();
       this.toMerge = request.getBranchToMerge();
       this.author = request.getAuthor();
+      this.messageTemplate = request.getMessageTemplate();
       this.clone = new Git(clone);
     }
 
@@ -111,13 +115,21 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       try {
         clone.commit()
           .setAuthor(authorToUse.getName(), authorToUse.getMail())
-          .setMessage(String.format(MERGE_COMMIT_MESSAGE_TEMPLATE, toMerge, target))
+          .setMessage(MessageFormat.format(determineMessageTemplate(), toMerge, target))
           .call();
       } catch (GitAPIException e) {
         throw new InternalRepositoryException("could not commit merge between branch " + toMerge + " and " + target, e);
       }
     }
 
+    private String determineMessageTemplate() {
+      if (Strings.isNullOrEmpty(messageTemplate)) {
+        return MERGE_COMMIT_MESSAGE_TEMPLATE;
+      } else {
+        return messageTemplate;
+      }
+    }
+
     private Person determineAuthor() {
       if (author == null) {
         Subject subject = SecurityUtils.getSubject();
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
index 5bb9af7d8f..1fca7814ed 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
@@ -67,14 +67,36 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
     Iterable<RevCommit> commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call();
     RevCommit mergeCommit = commits.iterator().next();
     PersonIdent mergeAuthor = mergeCommit.getAuthorIdent();
+    String message = mergeCommit.getFullMessage();
     assertThat(mergeAuthor.getName()).isEqualTo("Dirk Gently");
     assertThat(mergeAuthor.getEmailAddress()).isEqualTo("dirk@holistic.det");
+    assertThat(message).contains("master", "mergeable");
     // We expect the merge result of file b.txt here by looking up the sha hash of its content.
     // If the file is missing (aka not merged correctly) this will throw a MissingObjectException:
     byte[] contentOfFileB = repository.open(repository.resolve("9513e9c76e73f3e562fd8e4c909d0607113c77c6")).getBytes();
     assertThat(new String(contentOfFileB)).isEqualTo("b\ncontent from branch\n");
   }
 
+  @Test
+  public void shouldUseConfiguredCommitMessageTemplate() throws IOException, GitAPIException {
+    GitMergeCommand command = createCommand();
+    MergeCommandRequest request = new MergeCommandRequest();
+    request.setTargetBranch("master");
+    request.setBranchToMerge("mergeable");
+    request.setAuthor(new Person("Dirk Gently", "dirk@holistic.det"));
+    request.setMessageTemplate("simple");
+
+    MergeCommandResult mergeCommandResult = command.merge(request);
+
+    assertThat(mergeCommandResult.isSuccess()).isTrue();
+
+    Repository repository = createContext().open();
+    Iterable<RevCommit> commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call();
+    RevCommit mergeCommit = commits.iterator().next();
+    String message = mergeCommit.getFullMessage();
+    assertThat(message).isEqualTo("simple");
+  }
+
   @Test
   public void shouldNotMergeConflictingBranches() {
     GitMergeCommand command = createCommand();

From c04f6ff61665601170520d72dc0c11e6d3b88a03 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 8 Nov 2018 15:08:07 +0000
Subject: [PATCH 160/188] Close branch feature/merge_api


From bb28e53d1b3ca8df94c41d5cc151ac5fef643ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 8 Nov 2018 16:28:36 +0100
Subject: [PATCH 161/188] Set owner permission in new repository for logged in
 user

---
 .../RepositoryCollectionResource.java         | 19 ++++++++-
 .../resources/RepositoryRootResourceTest.java | 42 +++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
index ad9c29f14e..d8d5280456 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
@@ -5,12 +5,15 @@ import com.webcohesion.enunciate.metadata.rs.ResponseHeader;
 import com.webcohesion.enunciate.metadata.rs.ResponseHeaders;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
+import org.apache.shiro.SecurityUtils;
+import sonia.scm.repository.Permission;
+import sonia.scm.repository.PermissionType;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryManager;
+import sonia.scm.user.User;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DefaultValue;
@@ -21,6 +24,8 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 
+import static java.util.Collections.singletonList;
+
 public class RepositoryCollectionResource {
 
   private static final int DEFAULT_PAGE_SIZE = 10;
@@ -89,7 +94,17 @@ public class RepositoryCollectionResource {
   @ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created repository"))
   public Response create(@Valid RepositoryDto repository) {
     return adapter.create(repository,
-      () -> dtoToRepositoryMapper.map(repository, null),
+      () -> createModelObjectFromDto(repository),
       r -> resourceLinks.repository().self(r.getNamespace(), r.getName()));
   }
+
+  private Repository createModelObjectFromDto(@Valid RepositoryDto repositoryDto) {
+    Repository repository = dtoToRepositoryMapper.map(repositoryDto, null);
+    repository.setPermissions(singletonList(new Permission(currentUser(), PermissionType.OWNER)));
+    return repository;
+  }
+
+  private String currentUser() {
+    return SecurityUtils.getSubject().getPrincipals().oneByType(User.class).getName();
+  }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
index 0b2e50b6d9..fe403088f2 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
@@ -4,6 +4,9 @@ import com.github.sdorra.shiro.ShiroRule;
 import com.github.sdorra.shiro.SubjectAware;
 import com.google.common.io.Resources;
 import com.google.inject.util.Providers;
+import org.apache.shiro.subject.SimplePrincipalCollection;
+import org.apache.shiro.subject.Subject;
+import org.assertj.core.api.Assertions;
 import org.jboss.resteasy.core.Dispatcher;
 import org.jboss.resteasy.mock.MockHttpRequest;
 import org.jboss.resteasy.mock.MockHttpResponse;
@@ -22,6 +25,7 @@ import sonia.scm.repository.RepositoryIsNotArchivedException;
 import sonia.scm.repository.RepositoryManager;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
+import sonia.scm.user.User;
 import sonia.scm.web.VndMediaType;
 
 import javax.servlet.http.HttpServletResponse;
@@ -37,6 +41,7 @@ import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 import static javax.servlet.http.HttpServletResponse.SC_PRECONDITION_FAILED;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -59,6 +64,8 @@ import static sonia.scm.api.v2.resources.DispatcherMock.createDispatcher;
 )
 public class RepositoryRootResourceTest extends RepositoryTestBase {
 
+  private static final String REALM = "AdminRealm";
+
   private Dispatcher dispatcher;
 
   @Rule
@@ -96,6 +103,13 @@ public class RepositoryRootResourceTest extends RepositoryTestBase {
     when(serviceFactory.create(any(Repository.class))).thenReturn(service);
     when(scmPathInfoStore.get()).thenReturn(uriInfo);
     when(uriInfo.getApiRestUri()).thenReturn(URI.create("/x/y"));
+    SimplePrincipalCollection trillian = new SimplePrincipalCollection("trillian", REALM);
+    trillian.add(new User("trillian"), REALM);
+    shiro.setSubject(
+      new Subject.Builder()
+        .principals(trillian)
+        .authenticated(true)
+        .buildSubject());
   }
 
   @Test
@@ -257,6 +271,34 @@ public class RepositoryRootResourceTest extends RepositoryTestBase {
     verify(repositoryManager).create(any(Repository.class));
   }
 
+  @Test
+  public void shouldSetCurrentUserAsOwner() throws Exception {
+    ArgumentCaptor<Repository> createCaptor = ArgumentCaptor.forClass(Repository.class);
+    when(repositoryManager.create(createCaptor.capture())).thenAnswer(invocation -> {
+      Repository repository = (Repository) invocation.getArguments()[0];
+      repository.setNamespace("otherspace");
+      return repository;
+    });
+
+    URL url = Resources.getResource("sonia/scm/api/v2/repository-test-update.json");
+    byte[] repositoryJson = Resources.toByteArray(url);
+
+    MockHttpRequest request = MockHttpRequest
+      .post("/" + RepositoryRootResource.REPOSITORIES_PATH_V2)
+      .contentType(VndMediaType.REPOSITORY)
+      .content(repositoryJson);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    Assertions.assertThat(createCaptor.getValue().getPermissions())
+      .hasSize(1)
+      .allSatisfy(p -> {
+        assertThat(p.getName()).isEqualTo("trillian");
+        assertThat(p.getType()).isEqualTo(PermissionType.OWNER);
+      });
+  }
+
   @Test
   public void shouldNotOverwriteExistingPermissionsOnUpdate() throws Exception {
     Repository existingRepository = mockRepository("space", "repo");

From 78da8c743fc56943484eb38dcd319f8eb65b73cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 8 Nov 2018 16:42:45 +0100
Subject: [PATCH 162/188] Put repository in git context to create proper
 exceptions

---
 .../sonia/scm/repository/spi/GitContext.java  | 20 +++++++++++++------
 .../scm/repository/spi/GitMergeCommand.java   | 14 ++++++-------
 .../spi/GitRepositoryServiceProvider.java     |  2 +-
 .../spi/SimpleGitWorkdirFactory.java          |  4 ++--
 .../spi/AbstractGitCommandTestBase.java       |  2 +-
 .../spi/GitIncomingCommandTest.java           |  4 ++--
 .../spi/GitModificationsCommandTest.java      |  8 ++++----
 .../spi/GitOutgoingCommandTest.java           |  4 ++--
 .../repository/spi/GitPushCommandTest.java    |  2 +-
 9 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitContext.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitContext.java
index a10e16e200..b0dd8f1fd6 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitContext.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitContext.java
@@ -38,6 +38,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import sonia.scm.repository.GitUtil;
+import sonia.scm.repository.Repository;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -65,10 +66,12 @@ public class GitContext implements Closeable
    *
    *
    * @param directory
+   * @param repository
    */
-  public GitContext(File directory)
+  public GitContext(File directory, Repository repository)
   {
     this.directory = directory;
+    this.repository = repository;
   }
 
   //~--- methods --------------------------------------------------------------
@@ -82,8 +85,8 @@ public class GitContext implements Closeable
   {
     logger.trace("close git repository {}", directory);
 
-    GitUtil.close(repository);
-    repository = null;
+    GitUtil.close(gitRepository);
+    gitRepository = null;
   }
 
   /**
@@ -96,13 +99,17 @@ public class GitContext implements Closeable
    */
   public org.eclipse.jgit.lib.Repository open() throws IOException
   {
-    if (repository == null)
+    if (gitRepository == null)
     {
       logger.trace("open git repository {}", directory);
 
-      repository = GitUtil.open(directory);
+      gitRepository = GitUtil.open(directory);
     }
 
+    return gitRepository;
+  }
+
+  Repository getRepository() {
     return repository;
   }
 
@@ -114,7 +121,8 @@ public class GitContext implements Closeable
 
   /** Field description */
   private final File directory;
+  private final Repository repository;
 
   /** Field description */
-  private org.eclipse.jgit.lib.Repository repository;
+  private org.eclipse.jgit.lib.Repository gitRepository;
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
index 05541e8295..5e9eac5230 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
@@ -45,7 +45,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       logger.debug("cloned repository to folder {}", repository.getWorkTree());
       return new MergeWorker(repository, request).merge();
     } catch (IOException e) {
-      throw new InternalRepositoryException("could not clone repository for merge", e);
+      throw new InternalRepositoryException(context.getRepository(), "could not clone repository for merge", e);
     }
   }
 
@@ -56,11 +56,11 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
       return new MergeDryRunCommandResult(merger.merge(repository.resolve(request.getBranchToMerge()), repository.resolve(request.getTargetBranch())));
     } catch (IOException e) {
-      throw new InternalRepositoryException("could not clone repository for merge", e);
+      throw new InternalRepositoryException(context.getRepository(), "could not clone repository for merge", e);
     }
   }
 
-  private static class MergeWorker {
+  private class MergeWorker {
 
     private final String target;
     private final String toMerge;
@@ -92,7 +92,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       try {
         clone.checkout().setName(target).call();
       } catch (GitAPIException e) {
-        throw new InternalRepositoryException("could not checkout target branch for merge: " + target, e);
+        throw new InternalRepositoryException(context.getRepository(), "could not checkout target branch for merge: " + target, e);
       }
     }
 
@@ -104,7 +104,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
           .include(toMerge, resolveRevision(toMerge))
           .call();
       } catch (GitAPIException e) {
-        throw new InternalRepositoryException("could not merge branch " + toMerge + " into " + target, e);
+        throw new InternalRepositoryException(context.getRepository(), "could not merge branch " + toMerge + " into " + target, e);
       }
       return result;
     }
@@ -118,7 +118,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
           .setMessage(MessageFormat.format(determineMessageTemplate(), toMerge, target))
           .call();
       } catch (GitAPIException e) {
-        throw new InternalRepositoryException("could not commit merge between branch " + toMerge + " and " + target, e);
+        throw new InternalRepositoryException(context.getRepository(), "could not commit merge between branch " + toMerge + " and " + target, e);
       }
     }
 
@@ -147,7 +147,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
       try {
         clone.push().call();
       } catch (GitAPIException e) {
-        throw new InternalRepositoryException("could not push merged branch " + toMerge + " to origin", e);
+        throw new InternalRepositoryException(context.getRepository(), "could not push merged branch " + toMerge + " to origin", e);
       }
       logger.debug("pushed merged branch {}", target);
     }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
index a0a3074014..bda0d87b21 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
@@ -73,7 +73,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
   public GitRepositoryServiceProvider(GitRepositoryHandler handler, Repository repository) {
     this.handler = handler;
     this.repository = repository;
-    this.context = new GitContext(handler.getDirectory(repository));
+    this.context = new GitContext(handler.getDirectory(repository), repository);
   }
 
   //~--- methods --------------------------------------------------------------
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
index a8a54d3c0c..22fce5f330 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
@@ -33,9 +33,9 @@ public class SimpleGitWorkdirFactory implements GitWorkdirFactory {
       Repository clone = cloneRepository(gitContext.getDirectory(), createNewWorkdir());
       return new WorkingCopy(clone, this::close);
     } catch (GitAPIException e) {
-      throw new InternalRepositoryException("could not clone working copy of repository", e);
+      throw new InternalRepositoryException(gitContext.getRepository(), "could not clone working copy of repository", e);
     } catch (IOException e) {
-      throw new InternalRepositoryException("could not create temporary directory for clone of repository", e);
+      throw new InternalRepositoryException(gitContext.getRepository(), "could not create temporary directory for clone of repository", e);
     }
   }
 
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java
index 7d56db00d7..0b3c1d6e9d 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractGitCommandTestBase.java
@@ -65,7 +65,7 @@ public class AbstractGitCommandTestBase extends ZippedRepositoryTestBase
   {
     if (context == null)
     {
-      context = new GitContext(repositoryDirectory);
+      context = new GitContext(repositoryDirectory, repository);
     }
 
     return context;
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitIncomingCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitIncomingCommandTest.java
index e3d36601e7..9c4c8573ab 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitIncomingCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitIncomingCommandTest.java
@@ -105,7 +105,7 @@ public class GitIncomingCommandTest
 
     commit(outgoing, "added a");
     
-    GitPullCommand pull = new GitPullCommand(handler, new GitContext(incomingDirectory), incomingRepository);
+    GitPullCommand pull = new GitPullCommand(handler, new GitContext(incomingDirectory, null), incomingRepository);
     PullCommandRequest req = new PullCommandRequest();
     req.setRemoteRepository(outgoingRepository);
     pull.pull(req);
@@ -191,7 +191,7 @@ public class GitIncomingCommandTest
    */
   private GitIncomingCommand createCommand()
   {
-    return new GitIncomingCommand(handler, new GitContext(incomingDirectory),
+    return new GitIncomingCommand(handler, new GitContext(incomingDirectory, null),
       incomingRepository);
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModificationsCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModificationsCommandTest.java
index fb982f6f0c..41a516a124 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModificationsCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModificationsCommandTest.java
@@ -18,8 +18,8 @@ public class GitModificationsCommandTest extends AbstractRemoteCommandTestBase {
 
   @Before
   public void init() {
-    incomingModificationsCommand = new GitModificationsCommand(new GitContext(incomingDirectory), incomingRepository);
-    outgoingModificationsCommand = new GitModificationsCommand(new GitContext(outgoingDirectory), outgoingRepository);
+    incomingModificationsCommand = new GitModificationsCommand(new GitContext(incomingDirectory, null), incomingRepository);
+    outgoingModificationsCommand = new GitModificationsCommand(new GitContext(outgoingDirectory, null), outgoingRepository);
   }
 
   @Test
@@ -63,12 +63,12 @@ public class GitModificationsCommandTest extends AbstractRemoteCommandTestBase {
   }
 
   void pushOutgoingAndPullIncoming() throws IOException {
-    GitPushCommand cmd = new GitPushCommand(handler, new GitContext(outgoingDirectory),
+    GitPushCommand cmd = new GitPushCommand(handler, new GitContext(outgoingDirectory, null),
       outgoingRepository);
     PushCommandRequest request = new PushCommandRequest();
     request.setRemoteRepository(incomingRepository);
     cmd.push(request);
-    GitPullCommand pullCommand = new GitPullCommand(handler, new GitContext(incomingDirectory),
+    GitPullCommand pullCommand = new GitPullCommand(handler, new GitContext(incomingDirectory, null),
       incomingRepository);
     PullCommandRequest pullRequest = new PullCommandRequest();
     pullRequest.setRemoteRepository(incomingRepository);
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitOutgoingCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitOutgoingCommandTest.java
index 3510650fb4..f51c4a94eb 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitOutgoingCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitOutgoingCommandTest.java
@@ -106,7 +106,7 @@ public class GitOutgoingCommandTest extends AbstractRemoteCommandTestBase
     commit(outgoing, "added a");
 
     GitPushCommand push = new GitPushCommand(handler,
-                            new GitContext(outgoingDirectory),
+                            new GitContext(outgoingDirectory, null),
                             outgoingRepository);
     PushCommandRequest req = new PushCommandRequest();
 
@@ -161,7 +161,7 @@ public class GitOutgoingCommandTest extends AbstractRemoteCommandTestBase
    */
   private GitOutgoingCommand createCommand()
   {
-    return new GitOutgoingCommand(handler, new GitContext(outgoingDirectory),
+    return new GitOutgoingCommand(handler, new GitContext(outgoingDirectory, null),
       outgoingRepository);
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitPushCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitPushCommandTest.java
index 4f3d7e933d..17c06556b8 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitPushCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitPushCommandTest.java
@@ -99,7 +99,7 @@ public class GitPushCommandTest extends AbstractRemoteCommandTestBase
    */
   private GitPushCommand createCommand()
   {
-    return new GitPushCommand(handler, new GitContext(outgoingDirectory),
+    return new GitPushCommand(handler, new GitContext(outgoingDirectory, null),
       outgoingRepository);
   }
 }

From 232e4fc072c2710cb7bf99d46f02612a54fcda7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 8 Nov 2018 17:01:57 +0100
Subject: [PATCH 163/188] Delete wrong throws JavaDoc declarations

---
 .../java/sonia/scm/repository/spi/GitOutgoingCommand.java     | 1 -
 .../main/java/sonia/scm/repository/spi/GitPullCommand.java    | 1 -
 .../main/java/sonia/scm/repository/spi/GitPushCommand.java    | 1 -
 .../src/main/java/sonia/scm/web/GitRepositoryViewer.java      | 1 -
 .../java/sonia/scm/repository/spi/GitBlameCommandTest.java    | 2 --
 .../java/sonia/scm/repository/spi/GitIncomingCommandTest.java | 4 ----
 .../java/sonia/scm/repository/spi/GitOutgoingCommandTest.java | 3 ---
 .../java/sonia/scm/repository/spi/GitPushCommandTest.java     | 1 -
 8 files changed, 14 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitOutgoingCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitOutgoingCommand.java
index 2a1f805cf6..6bdd8b793a 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitOutgoingCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitOutgoingCommand.java
@@ -77,7 +77,6 @@ public class GitOutgoingCommand extends AbstractGitIncomingOutgoingCommand
    * @return
    *
    * @throws IOException
-   * @throws RepositoryException
    */
   @Override
   public ChangesetPagingResult getOutgoingChangesets(
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java
index bb06e1fd9d..7a829355bf 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java
@@ -101,7 +101,6 @@ public class GitPullCommand extends AbstractGitPushOrPullCommand
    * @return
    *
    * @throws IOException
-   * @throws RepositoryException
    */
   @Override
   public PullResponse pull(PullCommandRequest request)
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPushCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPushCommand.java
index 193d68d7a5..3963366aa7 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPushCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPushCommand.java
@@ -85,7 +85,6 @@ public class GitPushCommand extends AbstractGitPushOrPullCommand
    * @return
    *
    * @throws IOException
-   * @throws RepositoryException
    */
   @Override
   public PushResponse push(PushCommandRequest request)
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java
index 773e09aada..82e19c77b7 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java
@@ -151,7 +151,6 @@ public class GitRepositoryViewer
    * @return
    *
    * @throws IOException
-   * @throws RepositoryException
    */
   private BranchesModel createBranchesModel(Repository repository)
     throws IOException
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBlameCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBlameCommandTest.java
index d0fd627046..5757cd5d5e 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBlameCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBlameCommandTest.java
@@ -85,7 +85,6 @@ public class GitBlameCommandTest extends AbstractGitCommandTestBase
    *
    *
    * @throws IOException
-   * @throws RepositoryException
    */
   @Test
   public void testGetBlameResult() throws IOException
@@ -119,7 +118,6 @@ public class GitBlameCommandTest extends AbstractGitCommandTestBase
    *
    *
    * @throws IOException
-   * @throws RepositoryException
    */
   @Test
   public void testGetBlameResultWithRevision()
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitIncomingCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitIncomingCommandTest.java
index 9c4c8573ab..acf0b0f820 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitIncomingCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitIncomingCommandTest.java
@@ -61,7 +61,6 @@ public class GitIncomingCommandTest
    *
    * @throws GitAPIException
    * @throws IOException
-   * @throws RepositoryException
    */
   @Test
   public void testGetIncomingChangesets()
@@ -95,7 +94,6 @@ public class GitIncomingCommandTest
    *
    * @throws GitAPIException
    * @throws IOException
-   * @throws RepositoryException
    */
   @Test
   public void testGetIncomingChangesetsWithAllreadyPullChangesets()
@@ -132,7 +130,6 @@ public class GitIncomingCommandTest
    *
    *
    * @throws IOException
-   * @throws RepositoryException
    */
   @Test
   public void testGetIncomingChangesetsWithEmptyRepository()
@@ -156,7 +153,6 @@ public class GitIncomingCommandTest
    *
    * @throws GitAPIException
    * @throws IOException
-   * @throws RepositoryException
    */
   @Test
   @Ignore
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitOutgoingCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitOutgoingCommandTest.java
index f51c4a94eb..65592cf7e4 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitOutgoingCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitOutgoingCommandTest.java
@@ -61,7 +61,6 @@ public class GitOutgoingCommandTest extends AbstractRemoteCommandTestBase
    *
    * @throws GitAPIException
    * @throws IOException
-   * @throws RepositoryException
    */
   @Test
   public void testGetOutgoingChangesets()
@@ -95,7 +94,6 @@ public class GitOutgoingCommandTest extends AbstractRemoteCommandTestBase
    *
    * @throws GitAPIException
    * @throws IOException
-   * @throws RepositoryException
    */
   @Test
   public void testGetOutgoingChangesetsWithAlreadyPushedChanges()
@@ -135,7 +133,6 @@ public class GitOutgoingCommandTest extends AbstractRemoteCommandTestBase
    *
    *
    * @throws IOException
-   * @throws RepositoryException
    */
   @Test
   public void testGetOutgoingChangesetsWithEmptyRepository()
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitPushCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitPushCommandTest.java
index 17c06556b8..70212ba233 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitPushCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitPushCommandTest.java
@@ -61,7 +61,6 @@ public class GitPushCommandTest extends AbstractRemoteCommandTestBase
    *
    * @throws GitAPIException
    * @throws IOException
-   * @throws RepositoryException
    */
   @Test
   public void testPush()

From 42bf785a425a4cd7e31113e5a546feafe3bfcefb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 9 Nov 2018 08:03:58 +0100
Subject: [PATCH 164/188] Register interceptor for web request calls

---
 .../main/java/sonia/scm/ScmServletModule.java | 20 +++++++++++++++++++
 .../scm/security/SecurityInterceptor.java     | 12 +++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 scm-webapp/src/main/java/sonia/scm/security/SecurityInterceptor.java

diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
index 90764a7e00..4139cb60a5 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
@@ -45,6 +45,7 @@ import sonia.scm.api.rest.ObjectMapperProvider;
 import sonia.scm.cache.CacheManager;
 import sonia.scm.cache.GuavaCacheManager;
 import sonia.scm.config.ScmConfiguration;
+import sonia.scm.debug.DebugResource;
 import sonia.scm.event.ScmEventBus;
 import sonia.scm.group.DefaultGroupManager;
 import sonia.scm.group.GroupDAO;
@@ -87,6 +88,7 @@ import sonia.scm.security.DefaultKeyGenerator;
 import sonia.scm.security.DefaultSecuritySystem;
 import sonia.scm.security.KeyGenerator;
 import sonia.scm.security.LoginAttemptHandler;
+import sonia.scm.security.SecurityInterceptor;
 import sonia.scm.security.SecuritySystem;
 import sonia.scm.store.BlobStoreFactory;
 import sonia.scm.store.ConfigurationEntryStoreFactory;
@@ -118,7 +120,17 @@ import sonia.scm.web.security.DefaultAdministrationContext;
 
 import javax.net.ssl.SSLContext;
 import javax.servlet.ServletContext;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.HEAD;
+import javax.ws.rs.OPTIONS;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
 
+import static com.google.inject.matcher.Matchers.annotatedWith;
+import static com.google.inject.matcher.Matchers.any;
+import static com.google.inject.matcher.Matchers.not;
+import static com.google.inject.matcher.Matchers.subclassesOf;
 import static sonia.scm.api.v2.resources.ScmPathInfo.REST_API_PATH;
 
 /**
@@ -319,6 +331,14 @@ public class ScmServletModule extends ServletModule
     // bind(LastModifiedUpdateListener.class);
 
     bind(PushStateDispatcher.class).toProvider(PushStateDispatcherProvider.class);
+    bindInterceptor(not(subclassesOf(DebugResource.class)),
+      annotatedWith(GET.class)
+        .or(annotatedWith(POST.class))
+        .or(annotatedWith(HEAD.class))
+        .or(annotatedWith(PUT.class))
+        .or(annotatedWith(DELETE.class))
+        .or(annotatedWith(OPTIONS.class)),
+      new SecurityInterceptor());
   }
 
 
diff --git a/scm-webapp/src/main/java/sonia/scm/security/SecurityInterceptor.java b/scm-webapp/src/main/java/sonia/scm/security/SecurityInterceptor.java
new file mode 100644
index 0000000000..56e8ff5fc4
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/security/SecurityInterceptor.java
@@ -0,0 +1,12 @@
+package sonia.scm.security;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+public class SecurityInterceptor implements MethodInterceptor {
+
+  @Override
+  public Object invoke(MethodInvocation methodInvocation) throws Throwable {
+    return methodInvocation.proceed();
+  }
+}

From afbffa5978e79e59e1d66b6c37c3a69914ad1586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 9 Nov 2018 10:13:36 +0100
Subject: [PATCH 165/188] Fix tests for default owner permission

Therefore add explicit methods to change the permission collection
of a repository.
---
 .../java/sonia/scm/repository/Repository.java | 28 +++++++++++--------
 .../java/sonia/scm/it/PermissionsITCase.java  | 11 +++++---
 .../java/sonia/scm/it/utils/TestData.java     |  4 +--
 .../v2/resources/PermissionRootResource.java  |  4 +--
 .../AuthorizationChangedEventProducer.java    |  2 +-
 .../DefaultAuthorizationCollector.java        |  5 ++--
 .../resources/PermissionRootResourceTest.java | 21 ++++++--------
 .../DefaultRepositoryManagerPerfTest.java     |  2 +-
 8 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/Repository.java b/scm-core/src/main/java/sonia/scm/repository/Repository.java
index 19c5b31349..fd8f07df8d 100644
--- a/scm-core/src/main/java/sonia/scm/repository/Repository.java
+++ b/scm-core/src/main/java/sonia/scm/repository/Repository.java
@@ -37,7 +37,6 @@ import com.github.sdorra.ssp.PermissionObject;
 import com.github.sdorra.ssp.StaticPermissions;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
 import sonia.scm.BasicPropertiesAware;
 import sonia.scm.ModelObject;
 import sonia.scm.util.Util;
@@ -50,8 +49,11 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Source code repository.
@@ -79,7 +81,7 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
   private Long lastModified;
   private String namespace;
   private String name;
-  private List<Permission> permissions;
+  private final Set<Permission> permissions = new HashSet<>();
   @XmlElement(name = "public")
   private boolean publicReadable = false;
   private boolean archived = false;
@@ -127,7 +129,6 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
     this.name = name;
     this.contact = contact;
     this.description = description;
-    this.permissions = Lists.newArrayList();
 
     if (Util.isNotEmpty(permissions)) {
       this.permissions.addAll(Arrays.asList(permissions));
@@ -200,12 +201,8 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
     return new NamespaceAndName(getNamespace(), getName());
   }
 
-  public List<Permission> getPermissions() {
-    if (permissions == null) {
-      permissions = Lists.newArrayList();
-    }
-
-    return permissions;
+  public Collection<Permission> getPermissions() {
+    return Collections.unmodifiableCollection(permissions);
   }
 
   /**
@@ -300,8 +297,17 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
     this.name = name;
   }
 
-  public void setPermissions(List<Permission> permissions) {
-    this.permissions = permissions;
+  public void setPermissions(Collection<Permission> permissions) {
+    this.permissions.clear();
+    this.permissions.addAll(permissions);
+  }
+
+  public void addPermission(Permission newPermission) {
+    this.permissions.add(newPermission);
+  }
+
+  public void removePermission(Permission permission) {
+    this.permissions.remove(permission);
   }
 
   public void setPublicReadable(boolean publicReadable) {
diff --git a/scm-it/src/test/java/sonia/scm/it/PermissionsITCase.java b/scm-it/src/test/java/sonia/scm/it/PermissionsITCase.java
index 8785f1d8ce..aa91e67022 100644
--- a/scm-it/src/test/java/sonia/scm/it/PermissionsITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/PermissionsITCase.java
@@ -32,6 +32,7 @@
 package sonia.scm.it;
 
 import org.apache.http.HttpStatus;
+import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -49,8 +50,10 @@ import sonia.scm.web.VndMediaType;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
+import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static sonia.scm.it.utils.RepositoryUtil.addAndCommitRandomFile;
@@ -72,7 +75,7 @@ public class PermissionsITCase {
   public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
   private final String repositoryType;
-  private int createdPermissions;
+  private Collection<String> createdPermissions;
 
 
   public PermissionsITCase(String repositoryType) {
@@ -94,7 +97,7 @@ public class PermissionsITCase {
     TestData.createNotAdminUser(USER_OWNER, USER_PASS);
     TestData.createUserPermission(USER_OWNER, PermissionType.OWNER, repositoryType);
     TestData.createNotAdminUser(USER_OTHER, USER_PASS);
-    createdPermissions = 3;
+    createdPermissions = asList(USER_READ, USER_WRITE, USER_OWNER);
   }
 
   @Test
@@ -131,8 +134,8 @@ public class PermissionsITCase {
 
   @Test
   public void ownerShouldSeePermissions() {
-    List<Object> userPermissions = TestData.getUserPermissions(USER_OWNER, USER_PASS, repositoryType);
-    assertEquals(userPermissions.size(), createdPermissions);
+    List<Map> userPermissions = TestData.getUserPermissions(USER_OWNER, USER_PASS, repositoryType);
+    Assertions.assertThat(userPermissions).extracting(e -> e.get("name")).containsAll(createdPermissions);
   }
 
   @Test
diff --git a/scm-it/src/test/java/sonia/scm/it/utils/TestData.java b/scm-it/src/test/java/sonia/scm/it/utils/TestData.java
index a164fc6649..48605437c6 100644
--- a/scm-it/src/test/java/sonia/scm/it/utils/TestData.java
+++ b/scm-it/src/test/java/sonia/scm/it/utils/TestData.java
@@ -99,10 +99,10 @@ public class TestData {
     ;
   }
 
-  public static List<Object> getUserPermissions(String username, String password, String repositoryType) {
+  public static List<Map> getUserPermissions(String username, String password, String repositoryType) {
     return callUserPermissions(username, password, repositoryType, HttpStatus.SC_OK)
       .extract()
-      .body().jsonPath().getList("_embedded.permissions");
+      .body().jsonPath().<Map>getList("_embedded.permissions");
   }
 
   public static ValidatableResponse callUserPermissions(String username, String password, String repositoryType, int expectedStatusCode) {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
index 9335e2b2df..127a3f450e 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
@@ -79,7 +79,7 @@ public class PermissionRootResource {
     Repository repository = load(namespace, name);
     RepositoryPermissions.permissionWrite(repository).check();
     checkPermissionAlreadyExists(permission, repository);
-    repository.getPermissions().add(dtoToModelMapper.map(permission));
+    repository.addPermission(dtoToModelMapper.map(permission));
     manager.modify(repository);
     String urlPermissionName = modelToDtoMapper.getUrlPermissionName(permission);
     return Response.created(URI.create(resourceLinks.permission().self(namespace, name, urlPermissionName))).build();
@@ -209,7 +209,7 @@ public class PermissionRootResource {
       .stream()
       .filter(filterPermission(permissionName))
       .findFirst()
-      .ifPresent(p -> repository.getPermissions().remove(p))
+      .ifPresent(repository::removePermission)
     ;
     manager.modify(repository);
     log.info("the permission with name: {} is updated.", permissionName);
diff --git a/scm-webapp/src/main/java/sonia/scm/security/AuthorizationChangedEventProducer.java b/scm-webapp/src/main/java/sonia/scm/security/AuthorizationChangedEventProducer.java
index 5a954bb1e7..cf4c980625 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/AuthorizationChangedEventProducer.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/AuthorizationChangedEventProducer.java
@@ -167,7 +167,7 @@ public class AuthorizationChangedEventProducer {
   private boolean isAuthorizationDataModified(Repository repository, Repository beforeModification) {
     return repository.isArchived() != beforeModification.isArchived()
       || repository.isPublicReadable() != beforeModification.isPublicReadable()
-      || ! repository.getPermissions().equals(beforeModification.getPermissions());
+      || !(repository.getPermissions().containsAll(beforeModification.getPermissions()) && beforeModification.getPermissions().containsAll(repository.getPermissions()));
   }
   
   private void fireEventForEveryUser() {
diff --git a/scm-webapp/src/main/java/sonia/scm/security/DefaultAuthorizationCollector.java b/scm-webapp/src/main/java/sonia/scm/security/DefaultAuthorizationCollector.java
index faa7208c66..8a79293642 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/DefaultAuthorizationCollector.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/DefaultAuthorizationCollector.java
@@ -54,13 +54,14 @@ import sonia.scm.cache.CacheManager;
 import sonia.scm.group.GroupNames;
 import sonia.scm.group.GroupPermissions;
 import sonia.scm.plugin.Extension;
+import sonia.scm.repository.Permission;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryDAO;
-import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.user.User;
 import sonia.scm.user.UserPermissions;
 import sonia.scm.util.Util;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
@@ -198,7 +199,7 @@ public class DefaultAuthorizationCollector implements AuthorizationCollector
   private void collectRepositoryPermissions(Builder<String> builder,
     Repository repository, User user, GroupNames groups)
   {
-    List<sonia.scm.repository.Permission> repositoryPermissions
+    Collection<Permission> repositoryPermissions
       = repository.getPermissions();
 
     if (Util.isNotEmpty(repositoryPermissions))
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
index 0487e445c1..c008e0b8db 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
@@ -402,18 +402,17 @@ public class PermissionRootResourceTest extends RepositoryTestBase {
   }
 
   private Repository createUserWithRepository(String userPermission) {
-    Repository mockRepository = mock(Repository.class);
-    when(mockRepository.getId()).thenReturn(REPOSITORY_NAME);
-    when(mockRepository.getNamespace()).thenReturn(REPOSITORY_NAMESPACE);
-    when(mockRepository.getName()).thenReturn(REPOSITORY_NAME);
-    when(mockRepository.getNamespaceAndName()).thenReturn(new NamespaceAndName(REPOSITORY_NAMESPACE, REPOSITORY_NAME));
+    Repository mockRepository = new Repository();
+    mockRepository.setId(REPOSITORY_NAME);
+    mockRepository.setNamespace(REPOSITORY_NAMESPACE);
+    mockRepository.setName(REPOSITORY_NAME);
     when(repositoryManager.get(any(NamespaceAndName.class))).thenReturn(mockRepository);
     when(subject.isPermitted(userPermission != null ? eq(userPermission) : any(String.class))).thenReturn(true);
     return mockRepository;
   }
 
   private void createUserWithRepositoryAndPermissions(ArrayList<Permission> permissions, String userPermission) {
-    when(createUserWithRepository(userPermission).getPermissions()).thenReturn(permissions);
+    createUserWithRepository(userPermission).setPermissions(permissions);
   }
 
   private Stream<DynamicTest> createDynamicTestsToAssertResponses(ExpectedRequest... expectedRequests) {
@@ -421,10 +420,9 @@ public class PermissionRootResourceTest extends RepositoryTestBase {
       .map(entry -> dynamicTest("the endpoint " + entry.description + " should return the status code " + entry.expectedResponseStatus, () -> assertExpectedRequest(entry)));
   }
 
-  private MockHttpResponse assertExpectedRequest(ExpectedRequest entry) throws URISyntaxException {
+  private void assertExpectedRequest(ExpectedRequest entry) throws URISyntaxException {
     MockHttpResponse response = new MockHttpResponse();
-    HttpRequest request = null;
-    request = MockHttpRequest
+    HttpRequest request = MockHttpRequest
       .create(entry.method, "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + entry.path)
       .content(entry.content)
       .contentType(VndMediaType.PERMISSION);
@@ -436,7 +434,6 @@ public class PermissionRootResourceTest extends RepositoryTestBase {
     if (entry.responseValidator != null) {
       entry.responseValidator.accept(response);
     }
-    return response;
   }
 
   @ToString
@@ -470,12 +467,12 @@ public class PermissionRootResourceTest extends RepositoryTestBase {
       return this;
     }
 
-    public ExpectedRequest expectedResponseStatus(int expectedResponseStatus) {
+    ExpectedRequest expectedResponseStatus(int expectedResponseStatus) {
       this.expectedResponseStatus = expectedResponseStatus;
       return this;
     }
 
-    public ExpectedRequest responseValidator(Consumer<MockHttpResponse> responseValidator) {
+    ExpectedRequest responseValidator(Consumer<MockHttpResponse> responseValidator) {
       this.responseValidator = responseValidator;
       return this;
     }
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerPerfTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerPerfTest.java
index 448c2561f3..9d03fa02ca 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerPerfTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerPerfTest.java
@@ -184,7 +184,7 @@ private long calculateAverage(List<Long> times) {
   
   private Repository createTestRepository(int number) {
     Repository repository = new Repository(keyGenerator.createKey(), REPOSITORY_TYPE, "namespace", "repo-" + number);
-    repository.getPermissions().add(new Permission("trillian", PermissionType.READ));
+    repository.addPermission(new Permission("trillian", PermissionType.READ));
     return repository;
   }
   

From 05cbffd8a4d8eab6da1e0952b9a5f008f14a3b01 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 9 Nov 2018 14:04:26 +0100
Subject: [PATCH 166/188] added name to textarea

---
 .../packages/ui-components/src/forms/Textarea.js             | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scm-ui-components/packages/ui-components/src/forms/Textarea.js b/scm-ui-components/packages/ui-components/src/forms/Textarea.js
index 0bf386aca7..5a14b3407a 100644
--- a/scm-ui-components/packages/ui-components/src/forms/Textarea.js
+++ b/scm-ui-components/packages/ui-components/src/forms/Textarea.js
@@ -8,10 +8,11 @@ export type SelectItem = {
 };
 
 type Props = {
+  name?: string,
   label?: string,
   placeholder?: SelectItem[],
   value?: string,
-  onChange: string => void,
+  onChange: (value: string, name?: string) => void,
   helpText?: string
 };
 
@@ -19,7 +20,7 @@ class Textarea extends React.Component<Props> {
   field: ?HTMLTextAreaElement;
 
   handleInput = (event: SyntheticInputEvent<HTMLTextAreaElement>) => {
-    this.props.onChange(event.target.value);
+    this.props.onChange(event.target.value, this.props.name);
   };
 
   render() {

From de94efb6c71b4b1c74ca2428b5e63ae0f4378457 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 9 Nov 2018 14:04:47 +0100
Subject: [PATCH 167/188] added extension points to repository root

---
 scm-ui/src/repos/containers/RepositoryRoot.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index d0c4947af9..9b8991a91a 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -35,6 +35,7 @@ import PermissionsNavLink from "../components/PermissionsNavLink";
 import Sources from "../sources/containers/Sources";
 import RepositoryNavLink from "../components/RepositoryNavLink";
 import { getRepositoriesLink } from "../../modules/indexResource";
+import {ExtensionPoint} from '@scm-manager/ui-extensions';
 
 type Props = {
   namespace: string,
@@ -104,6 +105,12 @@ class RepositoryRoot extends React.Component<Props> {
     }
 
     const url = this.matchedUrl();
+
+    const extensionProps = {
+      repository,
+      url
+    };
+
     return (
       <Page title={repository.namespace + "/" + repository.name}>
         <div className="columns">
@@ -165,6 +172,10 @@ class RepositoryRoot extends React.Component<Props> {
                   />
                 )}
               />
+              <ExtensionPoint name="repository.route"
+                              props={extensionProps}
+                              renderAll={true}
+              />
             </Switch>
           </div>
           <div className="column">
@@ -186,11 +197,15 @@ class RepositoryRoot extends React.Component<Props> {
                   label={t("repository-root.sources")}
                   activeOnlyWhenExact={false}
                 />
-                <EditNavLink repository={repository} editUrl={`${url}/edit`} />
+                <ExtensionPoint name="repository.navigation"
+                                props={extensionProps}
+                                renderAll={true}
+                />
                 <PermissionsNavLink
                   permissionUrl={`${url}/permissions`}
                   repository={repository}
                 />
+                <EditNavLink repository={repository} editUrl={`${url}/edit`} />
               </Section>
               <Section label={t("repository-root.actions-label")}>
                 <DeleteNavAction repository={repository} delete={this.delete} />

From aeae67676f71d7b238cef2f5083ccc95a7f00195 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 9 Nov 2018 13:18:40 +0000
Subject: [PATCH 168/188] Close branch feature/user_as_owner


From 96c2114e5326985aed2ce5fa651ed1a20f7854c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 9 Nov 2018 16:06:31 +0100
Subject: [PATCH 169/188] Reduce SecurityFilter to user injection and enable
 SecurityInterceptor

Remove all the unnecessary stuff and all endpoints that would be no
longer secure.
---
 .../main/java/sonia/scm/filter/Filters.java   |  31 --
 .../api/rest/resources/GitConfigResource.java | 124 ------
 .../api/rest/resources/HgConfigResource.java  | 348 -----------------
 .../api/rest/resources/SvnConfigResource.java | 125 ------
 .../main/java/sonia/scm/ScmServletModule.java |   1 -
 .../rest/AuthenticationExceptionMapper.java   |  13 +
 .../api/rest/ContextualExceptionMapper.java   |   6 +-
 .../rest/NotAuthorizedExceptionMapper.java    |  13 +
 .../rest/resources/ConfigurationResource.java | 148 -------
 .../scm/api/rest/resources/GroupResource.java | 248 ------------
 .../api/rest/resources/PluginResource.java    | 362 ------------------
 .../scm/api/rest/resources/UserResource.java  | 319 ---------------
 .../v2/resources/AuthenticationResource.java  |   1 +
 .../scm/api/v2/resources/IndexResource.java   |   2 +
 .../api/v2/resources/UIPluginResource.java    |   2 +
 .../sonia/scm/filter/AdminSecurityFilter.java |  90 -----
 .../java/sonia/scm/filter/SecurityFilter.java |  37 +-
 .../scm/security/AllowAnonymousAccess.java    |  11 +
 .../scm/security/SecurityInterceptor.java     |  19 +-
 .../scm/filter/AdminSecurityFilterTest.java   |  85 ----
 .../sonia/scm/filter/SecurityFilterTest.java  | 106 +----
 21 files changed, 86 insertions(+), 2005 deletions(-)
 delete mode 100644 scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/rest/resources/GitConfigResource.java
 delete mode 100644 scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/rest/resources/HgConfigResource.java
 delete mode 100644 scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/rest/resources/SvnConfigResource.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/rest/AuthenticationExceptionMapper.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/api/rest/NotAuthorizedExceptionMapper.java
 delete mode 100644 scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java
 delete mode 100644 scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java
 delete mode 100644 scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java
 delete mode 100644 scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java
 delete mode 100644 scm-webapp/src/main/java/sonia/scm/filter/AdminSecurityFilter.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/security/AllowAnonymousAccess.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/filter/AdminSecurityFilterTest.java

diff --git a/scm-core/src/main/java/sonia/scm/filter/Filters.java b/scm-core/src/main/java/sonia/scm/filter/Filters.java
index b1f5ea47cf..dbdc8f0e7e 100644
--- a/scm-core/src/main/java/sonia/scm/filter/Filters.java
+++ b/scm-core/src/main/java/sonia/scm/filter/Filters.java
@@ -45,28 +45,12 @@ public final class Filters
   /** Field description */
   public static final String PATTERN_ALL = "/*";
 
-  /** Field description */
-  public static final String PATTERN_CONFIG = REST_API_PATH + "/config*";
-
   /** Field description */
   public static final String PATTERN_DEBUG = "/debug.html";
 
-  /** Field description */
-  public static final String PATTERN_GROUPS = REST_API_PATH + "/groups*";
-
-  /** Field description */
-  public static final String PATTERN_PLUGINS = REST_API_PATH + "/plugins*";
-
-  /** Field description */
-  public static final String PATTERN_RESOURCE_REGEX =
-    "^/(?:resources|api|plugins|index)[\\./].*(?:html|\\.css|\\.js|\\.xml|\\.json|\\.txt)";
-
   /** Field description */
   public static final String PATTERN_RESTAPI = REST_API_PATH + "/*";
 
-  /** Field description */
-  public static final String PATTERN_USERS = REST_API_PATH + "/users*";
-
   /** authentication priority */
   public static final int PRIORITY_AUTHENTICATION = 5000;
 
@@ -79,21 +63,6 @@ public final class Filters
   /** post authentication priority */
   public static final int PRIORITY_POST_AUTHENTICATION = 5500;
 
-  /** pre authorization priority */
-  public static final int PRIORITY_POST_AUTHORIZATION = 6500;
-
-  /** post base url priority */
-  public static final int PRIORITY_POST_BASEURL = 1500;
-
-  /** pre authentication priority */
-  public static final int PRIORITY_PRE_AUTHENTICATION = 4500;
-
-  /** pre authorization priority */
-  public static final int PRIORITY_PRE_AUTHORIZATION = 5500;
-
-  /** pre base url priority */
-  public static final int PRIORITY_PRE_BASEURL = 500;
-
   //~--- constructors ---------------------------------------------------------
 
   /**
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/rest/resources/GitConfigResource.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/rest/resources/GitConfigResource.java
deleted file mode 100644
index bace7d0b73..0000000000
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/rest/resources/GitConfigResource.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-package sonia.scm.api.rest.resources;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-import sonia.scm.repository.GitConfig;
-import sonia.scm.repository.GitRepositoryHandler;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@Singleton
-@Path("config/repositories/git")
-@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-public class GitConfigResource
-{
-
-  /**
-   * Constructs ...
-   *
-   *
-   *
-   * @param repositoryHandler
-   */
-  @Inject
-  public GitConfigResource(GitRepositoryHandler repositoryHandler)
-  {
-    this.repositoryHandler = repositoryHandler;
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @GET
-  public GitConfig getConfig()
-  {
-    GitConfig config = repositoryHandler.getConfig();
-
-    if (config == null)
-    {
-      config = new GitConfig();
-      repositoryHandler.setConfig(config);
-    }
-
-    return config;
-  }
-
-  //~--- set methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param uriInfo
-   * @param config
-   *
-   * @return
-   */
-  @POST
-  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Response setConfig(@Context UriInfo uriInfo, GitConfig config)
-  {
-    repositoryHandler.setConfig(config);
-    repositoryHandler.storeConfig();
-
-    return Response.created(uriInfo.getRequestUri()).build();
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private GitRepositoryHandler repositoryHandler;
-}
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/rest/resources/HgConfigResource.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/rest/resources/HgConfigResource.java
deleted file mode 100644
index 6fc4f4e01a..0000000000
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/rest/resources/HgConfigResource.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.api.rest.resources;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-import sonia.scm.SCMContext;
-import sonia.scm.installer.HgInstallerFactory;
-import sonia.scm.installer.HgPackage;
-import sonia.scm.installer.HgPackageReader;
-import sonia.scm.installer.HgPackages;
-import sonia.scm.net.ahc.AdvancedHttpClient;
-import sonia.scm.repository.HgConfig;
-import sonia.scm.repository.HgRepositoryHandler;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import java.io.IOException;
-
-import java.util.List;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@Singleton
-@Path("config/repositories/hg")
-public class HgConfigResource
-{
-
-  /**
-   * Constructs ...
-   *
-   *
-   *
-   *
-   * @param client
-   * @param handler
-   * @param pkgReader
-   */
-  @Inject
-  public HgConfigResource(AdvancedHttpClient client,
-    HgRepositoryHandler handler, HgPackageReader pkgReader)
-  {
-    this.client = client;
-    this.handler = handler;
-    this.pkgReader = pkgReader;
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param uriInfo
-   *
-   * @return
-   */
-  @POST
-  @Path("auto-configuration")
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public HgConfig autoConfiguration(@Context UriInfo uriInfo)
-  {
-    return autoConfiguration(uriInfo, null);
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param uriInfo
-   * @param config
-   *
-   * @return
-   */
-  @POST
-  @Path("auto-configuration")
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public HgConfig autoConfiguration(@Context UriInfo uriInfo, HgConfig config)
-  {
-    if (config == null)
-    {
-      config = new HgConfig();
-    }
-
-    handler.doAutoConfiguration(config);
-
-    return handler.getConfig();
-  }
-
-  /**
-   * Method description
-   *
-   *
-   *
-   * @param id
-   * @return
-   */
-  @POST
-  @Path("packages/{pkgId}")
-  public Response installPackage(@PathParam("pkgId") String id)
-  {
-    Response response = null;
-    HgPackage pkg = pkgReader.getPackage(id);
-
-    if (pkg != null)
-    {
-      if (HgInstallerFactory.createInstaller().installPackage(client, handler,
-        SCMContext.getContext().getBaseDirectory(), pkg))
-      {
-        response = Response.noContent().build();
-      }
-      else
-      {
-        response =
-          Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
-      }
-    }
-    else
-    {
-      response = Response.status(Response.Status.NOT_FOUND).build();
-    }
-
-    return response;
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @GET
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public HgConfig getConfig()
-  {
-    HgConfig config = handler.getConfig();
-
-    if (config == null)
-    {
-      config = new HgConfig();
-    }
-
-    return config;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @GET
-  @Path("installations/hg")
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public InstallationsResponse getHgInstallations()
-  {
-    List<String> installations =
-      HgInstallerFactory.createInstaller().getHgInstallations();
-
-    return new InstallationsResponse(installations);
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @GET
-  @Path("packages")
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public HgPackages getPackages()
-  {
-    return pkgReader.getPackages();
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @GET
-  @Path("installations/python")
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public InstallationsResponse getPythonInstallations()
-  {
-    List<String> installations =
-      HgInstallerFactory.createInstaller().getPythonInstallations();
-
-    return new InstallationsResponse(installations);
-  }
-
-  //~--- set methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param uriInfo
-   * @param config
-   *
-   * @return
-   *
-   * @throws IOException
-   */
-  @POST
-  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML  })
-  public Response setConfig(@Context UriInfo uriInfo, HgConfig config)
-    throws IOException
-  {
-    handler.setConfig(config);
-    handler.storeConfig();
-
-    return Response.created(uriInfo.getRequestUri()).build();
-  }
-
-  //~--- inner classes --------------------------------------------------------
-
-  /**
-   * Class description
-   *
-   *
-   * @version        Enter version here..., 11/04/25
-   * @author         Enter your name here...
-   */
-  @XmlAccessorType(XmlAccessType.FIELD)
-  @XmlRootElement(name = "installations")
-  public static class InstallationsResponse
-  {
-
-    /**
-     * Constructs ...
-     *
-     */
-    public InstallationsResponse() {}
-
-    /**
-     * Constructs ...
-     *
-     *
-     * @param paths
-     */
-    public InstallationsResponse(List<String> paths)
-    {
-      this.paths = paths;
-    }
-
-    //~--- get methods --------------------------------------------------------
-
-    /**
-     * Method description
-     *
-     *
-     * @return
-     */
-    public List<String> getPaths()
-    {
-      return paths;
-    }
-
-    //~--- set methods --------------------------------------------------------
-
-    /**
-     * Method description
-     *
-     *
-     * @param paths
-     */
-    public void setPaths(List<String> paths)
-    {
-      this.paths = paths;
-    }
-
-    //~--- fields -------------------------------------------------------------
-
-    /** Field description */
-    @XmlElement(name = "path")
-    private List<String> paths;
-  }
-
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private AdvancedHttpClient client;
-
-  /** Field description */
-  private HgRepositoryHandler handler;
-
-  /** Field description */
-  private HgPackageReader pkgReader;
-}
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/rest/resources/SvnConfigResource.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/rest/resources/SvnConfigResource.java
deleted file mode 100644
index a1266ab4a4..0000000000
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/rest/resources/SvnConfigResource.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-package sonia.scm.api.rest.resources;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-import sonia.scm.repository.RepositoryManager;
-import sonia.scm.repository.SvnConfig;
-import sonia.scm.repository.SvnRepositoryHandler;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@Singleton
-@Path("config/repositories/svn")
-@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-public class SvnConfigResource
-{
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param repositoryManager
-   */
-  @Inject
-  public SvnConfigResource(RepositoryManager repositoryManager)
-  {
-    repositoryHandler = (SvnRepositoryHandler) repositoryManager.getHandler(
-      SvnRepositoryHandler.TYPE_NAME);
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @GET
-  public SvnConfig getConfig()
-  {
-    SvnConfig config = repositoryHandler.getConfig();
-
-    if (config == null)
-    {
-      config = new SvnConfig();
-      repositoryHandler.setConfig(config);
-    }
-
-    return config;
-  }
-
-  //~--- set methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param uriInfo
-   * @param config
-   *
-   * @return
-   */
-  @POST
-  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Response setConfig(@Context UriInfo uriInfo, SvnConfig config)
-  {
-    repositoryHandler.setConfig(config);
-    repositoryHandler.storeConfig();
-
-    return Response.created(uriInfo.getRequestUri()).build();
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private SvnRepositoryHandler repositoryHandler;
-}
diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
index 4139cb60a5..0d324137ce 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
@@ -128,7 +128,6 @@ import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 
 import static com.google.inject.matcher.Matchers.annotatedWith;
-import static com.google.inject.matcher.Matchers.any;
 import static com.google.inject.matcher.Matchers.not;
 import static com.google.inject.matcher.Matchers.subclassesOf;
 import static sonia.scm.api.v2.resources.ScmPathInfo.REST_API_PATH;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/AuthenticationExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/AuthenticationExceptionMapper.java
new file mode 100644
index 0000000000..6ba9984190
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/AuthenticationExceptionMapper.java
@@ -0,0 +1,13 @@
+package sonia.scm.api.rest;
+
+import org.apache.shiro.authc.AuthenticationException;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class AuthenticationExceptionMapper extends StatusExceptionMapper<AuthenticationException> {
+  public AuthenticationExceptionMapper() {
+    super(AuthenticationException.class, Response.Status.UNAUTHORIZED);
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
index 32ce336f1a..9584a1ea2c 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
@@ -26,7 +26,11 @@ public class ContextualExceptionMapper<E extends ExceptionWithContext> implement
 
   @Override
   public Response toResponse(E exception) {
-    logger.debug("map {} to status code {}", type.getSimpleName(), status.getStatusCode(), exception);
+    if (logger.isTraceEnabled()) {
+      logger.trace("map {} to status code {}", type.getSimpleName(), status.getStatusCode(), exception);
+    } else {
+      logger.debug("map {} to status code {} with message '{}'", type.getSimpleName(), status.getStatusCode(), exception.getMessage());
+    }
     return Response.status(status)
       .entity(mapper.map(exception))
       .type(VndMediaType.ERROR_TYPE)
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/NotAuthorizedExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/NotAuthorizedExceptionMapper.java
new file mode 100644
index 0000000000..fee3803de7
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/NotAuthorizedExceptionMapper.java
@@ -0,0 +1,13 @@
+package sonia.scm.api.rest;
+
+import javax.ws.rs.NotAuthorizedException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class NotAuthorizedExceptionMapper extends StatusExceptionMapper<NotAuthorizedException> {
+  public NotAuthorizedExceptionMapper()
+  {
+    super(NotAuthorizedException.class, Response.Status.UNAUTHORIZED);
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java
deleted file mode 100644
index a9beea7679..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.api.rest.resources;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.subject.Subject;
-
-import sonia.scm.config.ScmConfiguration;
-import sonia.scm.security.Role;
-import sonia.scm.security.ScmSecurityException;
-import sonia.scm.util.ScmConfigurationUtil;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@Singleton
-@Path("config")
-public class ConfigurationResource
-{
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param configuration
-   * @param securityContextProvider
-   */
-  @Inject
-  public ConfigurationResource(ScmConfiguration configuration)
-  {
-    this.configuration = configuration;
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @GET
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Response getConfiguration()
-  {
-    Response response = null;
-
-    if (SecurityUtils.getSubject().hasRole(Role.ADMIN))
-    {
-      response = Response.ok(configuration).build();
-    }
-    else
-    {
-      response = Response.status(Response.Status.FORBIDDEN).build();
-    }
-
-    return response;
-  }
-
-  //~--- set methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param uriInfo
-   * @param newConfig
-   *
-   * @return
-   */
-  @POST
-  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Response setConfig(@Context UriInfo uriInfo,
-    ScmConfiguration newConfig)
-  {
-
-    // TODO replace by checkRole
-    Subject subject = SecurityUtils.getSubject();
-
-    if (!subject.hasRole(Role.ADMIN))
-    {
-      throw new ScmSecurityException("admin privileges required");
-    }
-
-    configuration.load(newConfig);
-
-    synchronized (ScmConfiguration.class)
-    {
-      ScmConfigurationUtil.getInstance().store(configuration);
-    }
-
-    return Response.created(uriInfo.getRequestUri()).build();
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  public ScmConfiguration configuration;
-}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java
deleted file mode 100644
index a560cc278e..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.api.rest.resources;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.webcohesion.enunciate.metadata.rs.ResponseCode;
-import com.webcohesion.enunciate.metadata.rs.ResponseHeader;
-import com.webcohesion.enunciate.metadata.rs.StatusCodes;
-import com.webcohesion.enunciate.metadata.rs.TypeHint;
-import org.apache.shiro.SecurityUtils;
-import sonia.scm.group.Group;
-import sonia.scm.group.GroupManager;
-import sonia.scm.security.Role;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.GenericEntity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import java.util.Collection;
-
-//~--- JDK imports ------------------------------------------------------------
-
-/**
- * RESTful Web Service Resource to manage groups and their members.
- * 
- * @author Sebastian Sdorra
- */
-@Path("groups")
-@Singleton
-public class GroupResource extends AbstractManagerResource<Group> {
-
-  /** Field description */
-  public static final String PATH_PART = "groups";
-
-  //~--- constructors ---------------------------------------------------------
-
-  @Inject
-  public GroupResource(GroupManager groupManager)
-  {
-    super(groupManager, Group.class);
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Creates a new group. <strong>Note:</strong> This method requires admin privileges.
-   *
-   * @param uriInfo current uri informations
-   * @param group the group to be created
-   *
-   * @return
-   */
-  @POST
-  @StatusCodes({
-    @ResponseCode(code = 201, condition = "create success", additionalHeaders = {
-      @ResponseHeader(name = "Location", description = "uri to the created group")
-    }),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @Override
-  public Response create(@Context UriInfo uriInfo, Group group)
-  {
-    return super.create(uriInfo, group);
-  }
-
-  /**
-   * Deletes a group. <strong>Note:</strong> This method requires admin privileges.
-   *
-   * @param name the name of the group to delete.
-   *
-   * @return
-   */
-  @DELETE
-  @Path("{id}")
-  @StatusCodes({
-    @ResponseCode(code = 204, condition = "delete success"),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Override
-  public Response delete(@PathParam("id") String name)
-  {
-    return super.delete(name);
-  }
-
-  /**
-   * Modifies the given group. <strong>Note:</strong> This method requires admin privileges.
-   *
-   * @param name name of the group to be modified
-   * @param group group object to modify
-   *
-   * @return
-   */
-  @PUT
-  @Path("{id}")
-  @StatusCodes({
-    @ResponseCode(code = 204, condition = "update success"),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @Override
-  public Response update(@PathParam("id") String name, Group group)
-  {
-    return super.update(name, group);
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Fetches a group by its name or id. <strong>Note:</strong> This method requires admin privileges.
-   *
-   * @param request the current request
-   * @param id the id/name of the group
-   *
-   * @return the {@link Group} with the specified id
-   */
-  @GET
-  @Path("{id}")
-  @TypeHint(Group.class)
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
-    @ResponseCode(code = 404, condition = "not found, no group with the specified id/name available"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @Override
-  public Response get(@Context Request request, @PathParam("id") String id)
-  {
-    Response response = null;
-
-    if (SecurityUtils.getSubject().hasRole(Role.ADMIN))
-    {
-      response = super.get(request, id);
-    }
-    else
-    {
-      response = Response.status(Response.Status.FORBIDDEN).build();
-    }
-
-    return response;
-  }
-
-  /**
-   * Returns all groups. <strong>Note:</strong> This method requires admin privileges.
-   *
-   * @param request the current request
-   * @param start the start value for paging
-   * @param limit the limit value for paging
-   * @param sortby sort parameter
-   * @param desc sort direction desc or aesc
-   *
-   * @return
-   */
-  @GET
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @TypeHint(Group[].class)
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Override
-  public Response getAll(@Context Request request, @DefaultValue("0")
-  @QueryParam("start") int start, @DefaultValue("-1")
-  @QueryParam("limit") int limit, @QueryParam("sortby") String sortby,
-    @DefaultValue("false")
-  @QueryParam("desc") boolean desc)
-  {
-    return super.getAll(request, start, limit, sortby, desc);
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  @Override
-  protected GenericEntity<Collection<Group>> createGenericEntity(
-    Collection<Group> items)
-  {
-    return new GenericEntity<Collection<Group>>(items) {}
-    ;
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  @Override
-  protected String getId(Group group)
-  {
-    return group.getName();
-  }
-
-  @Override
-  protected String getPathPart()
-  {
-    return PATH_PART;
-  }
-}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java
deleted file mode 100644
index 4a770206eb..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.api.rest.resources;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.common.collect.Lists;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import sonia.scm.api.rest.RestActionResult;
-import sonia.scm.api.rest.RestActionUploadResult;
-import sonia.scm.plugin.OverviewPluginPredicate;
-import sonia.scm.plugin.PluginConditionFailedException;
-import sonia.scm.plugin.PluginInformation;
-import sonia.scm.plugin.PluginInformationComparator;
-import sonia.scm.plugin.PluginManager;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.webcohesion.enunciate.metadata.rs.ResponseCode;
-import com.webcohesion.enunciate.metadata.rs.StatusCodes;
-import com.webcohesion.enunciate.metadata.rs.TypeHint;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-/**
- * RESTful Web Service Endpoint to manage plugins.
- * 
- * @author Sebastian Sdorra
- */
-@Singleton
-@Path("plugins")
-public class PluginResource
-{
-
-  /**
-   * the logger for PluginResource
-   */
-  private static final Logger logger =
-    LoggerFactory.getLogger(PluginResource.class);
-
-  //~--- constructors ---------------------------------------------------------
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param pluginManager
-   */
-  @Inject
-  public PluginResource(PluginManager pluginManager)
-  {
-    this.pluginManager = pluginManager;
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Installs a plugin from a package.
-   *
-   * @param uploadedInputStream
-   * 
-   * @return
-   *
-   * @throws IOException
-   */
-  @POST
-  @Path("install-package")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 412, condition = "precondition failed"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Consumes(MediaType.MULTIPART_FORM_DATA)
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Response install(
-    /*@FormParam("package")*/ InputStream uploadedInputStream)
-    throws IOException
-  {
-    Response response = null;
-
-    try
-    {
-      pluginManager.installPackage(uploadedInputStream);
-      response = Response.ok(new RestActionUploadResult(true)).build();
-    }
-    catch (PluginConditionFailedException ex)
-    {
-      logger.warn(
-        "could not install plugin package, because the condition failed", ex);
-      response = Response.status(Status.PRECONDITION_FAILED).entity(
-        new RestActionResult(false)).build();
-    }
-    catch (Exception ex)
-    {
-      logger.warn("plugin installation failed", ex);
-      response =
-        Response.serverError().entity(new RestActionResult(false)).build();
-    }
-
-    return response;
-  }
-
-  /**
-   * Installs a plugin.
-   *
-   * @param id id of the plugin to be installed
-   *
-   * @return
-   */
-  @POST
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Path("install/{id}")
-  public Response install(@PathParam("id") String id)
-  {
-    pluginManager.install(id);
-
-    // TODO should return 204 no content
-    return Response.ok().build();
-  }
-
-  /**
-   * Installs a plugin from a package. This method is a workaround for ExtJS
-   * file upload, which requires text/html as content-type.
-   *
-   * @param uploadedInputStream
-   * @return
-   *
-   * @throws IOException
-   */
-  @POST
-  @Path("install-package.html")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 412, condition = "precondition failed"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Consumes(MediaType.MULTIPART_FORM_DATA)
-  @Produces(MediaType.TEXT_HTML)
-  public Response installFromUI(
-    /*@FormParam("package")*/ InputStream uploadedInputStream)
-    throws IOException
-  {
-    return install(uploadedInputStream);
-  }
-
-  /**
-   * Uninstalls a plugin.
-   *
-   * @param id id of the plugin to be uninstalled
-   *
-   * @return
-   */
-  @POST
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Path("uninstall/{id}")
-  public Response uninstall(@PathParam("id") String id)
-  {
-    pluginManager.uninstall(id);
-
-    // TODO should return 204 content
-    // consider to do a uninstall with a delete
-    return Response.ok().build();
-  }
-
-  /**
-   * Updates a plugin.
-   *
-   * @param id id of the plugin to be updated
-   *
-   * @return
-   */
-  @POST
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Path("update/{id}")
-  public Response update(@PathParam("id") String id)
-  {
-    pluginManager.update(id);
-
-    // TODO should return 204 content
-    // consider to do an update with a put
-    
-    return Response.ok().build();
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Returns all plugins.
-   *
-   * @return all plugins
-   */
-  @GET
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Collection<PluginInformation> getAll()
-  {
-    return pluginManager.getAll();
-  }
-
-  /**
-   * Returns all available plugins.
-   *
-   * @return all available plugins
-   */
-  @GET
-  @Path("available")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Collection<PluginInformation> getAvailable()
-  {
-    return pluginManager.getAvailable();
-  }
-
-  /**
-   * Returns all plugins which are available for update.
-   *
-   * @return all plugins which are available for update
-   */
-  @GET
-  @Path("updates")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Collection<PluginInformation> getAvailableUpdates()
-  {
-    return pluginManager.getAvailableUpdates();
-  }
-
-  /**
-   * Returns all installed plugins.
-   *
-   * @return all installed plugins
-   */
-  @GET
-  @Path("installed")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-  public Collection<PluginInformation> getInstalled()
-  {
-    return pluginManager.getInstalled();
-  }
-
-  /**
-   * Returns all plugins for the overview.
-   *
-   * @return all plugins for the overview
-   */
-  @GET
-  @Path("overview")
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  public Collection<PluginInformation> getOverview()
-  {
-    //J-
-    List<PluginInformation> plugins = Lists.newArrayList(
-      pluginManager.get(OverviewPluginPredicate.INSTANCE)
-    );
-    //J+
-
-    Collections.sort(plugins, PluginInformationComparator.INSTANCE);
-
-    Iterator<PluginInformation> it = plugins.iterator();
-    String last = null;
-
-    while (it.hasNext())
-    {
-      PluginInformation pi = it.next();
-      String id = pi.getId(false);
-
-      if ((last != null) && id.equals(last))
-      {
-        it.remove();
-      }
-
-      last = id;
-    }
-
-    return plugins;
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** plugin manager */
-  private final PluginManager pluginManager;
-}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java
deleted file mode 100644
index e054c4c32f..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.api.rest.resources;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.webcohesion.enunciate.metadata.rs.ResponseCode;
-import com.webcohesion.enunciate.metadata.rs.ResponseHeader;
-import com.webcohesion.enunciate.metadata.rs.StatusCodes;
-import com.webcohesion.enunciate.metadata.rs.TypeHint;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.credential.PasswordService;
-import sonia.scm.security.Role;
-import sonia.scm.user.User;
-import sonia.scm.user.UserManager;
-import sonia.scm.util.AssertUtil;
-import sonia.scm.util.Util;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.GenericEntity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import java.util.Collection;
-
-//~--- JDK imports ------------------------------------------------------------
-
-/**
- * RESTful Web Service Resource to manage users.
- * 
- * @author Sebastian Sdorra
- */
-@Singleton
-@Path("users")
-public class UserResource extends AbstractManagerResource<User>
-{
-
-  /** Field description */
-  public static final String DUMMY_PASSWORT = "__dummypassword__";
-
-  /** Field description */
-  public static final String PATH_PART = "users";
-
-  //~--- constructors ---------------------------------------------------------
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param userManager
-   * @param passwordService
-   */
-  @Inject
-  public UserResource(UserManager userManager, PasswordService passwordService)
-  {
-    super(userManager, User.class);
-    this.passwordService = passwordService;
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Creates a new user. <strong>Note:</strong> This method requires admin privileges.
-   *
-   * @param uriInfo current uri informations
-   * @param user the user to be created
-   *
-   * @return
-   */
-  @POST
-  @StatusCodes({
-    @ResponseCode(code = 201, condition = "create success", additionalHeaders = {
-      @ResponseHeader(name = "Location", description = "uri to the created group")
-    }),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @Override
-  public Response create(@Context UriInfo uriInfo, User user)
-  {
-    return super.create(uriInfo, user);
-  }
-
-  /**
-   * Deletes a user. <strong>Note:</strong> This method requires admin privileges.
-   *
-   * @param name the name of the user to delete.
-   *
-   * @return
-   */
-  @DELETE
-  @Path("{id}")
-  @StatusCodes({
-    @ResponseCode(code = 204, condition = "delete success"),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Override
-  public Response delete(@PathParam("id") String name)
-  {
-    return super.delete(name);
-  }
-
-  /**
-   * Modifies the given user. <strong>Note:</strong> This method requires admin privileges.
-   *
-   * @param name name of the user to be modified
-   * @param user user object to modify
-   *
-   * @return
-   */
-  @PUT
-  @Path("{id}")
-  @StatusCodes({
-    @ResponseCode(code = 204, condition = "update success"),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @TypeHint(TypeHint.NO_CONTENT.class)
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @Override
-  public Response update(@PathParam("id") String name, User user)
-  {
-    return super.update(name, user);
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Returns a user. <strong>Note:</strong> This method requires admin privileges.
-   *
-   * @param request the current request
-   * @param id the id/name of the user
-   *
-   * @return the {@link User} with the specified id
-   */
-  @GET
-  @Path("{id}")
-  @TypeHint(User.class)
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
-    @ResponseCode(code = 404, condition = "not found, no group with the specified id/name available"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @Override
-  public Response get(@Context Request request, @PathParam("id") String id)
-  {
-    Response response = null;
-
-    if (SecurityUtils.getSubject().hasRole(Role.ADMIN))
-    {
-      response = super.get(request, id);
-    }
-    else
-    {
-      response = Response.status(Response.Status.FORBIDDEN).build();
-    }
-
-    return response;
-  }
-
-  /**
-   * Returns all users. <strong>Note:</strong> This method requires admin privileges.
-   *
-   * @param request the current request
-   * @param start the start value for paging
-   * @param limit the limit value for paging
-   * @param sortby sort parameter
-   * @param desc sort direction desc or aesc
-   *
-   * @return
-   */
-  @GET
-  @TypeHint(User[].class)
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-  @Override
-  public Response getAll(@Context Request request, @DefaultValue("0")
-  @QueryParam("start") int start, @DefaultValue("-1")
-  @QueryParam("limit") int limit, @QueryParam("sortby") String sortby,
-    @DefaultValue("false")
-  @QueryParam("desc") boolean desc)
-  {
-    return super.getAll(request, start, limit, sortby, desc);
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  @Override
-  protected GenericEntity<Collection<User>> createGenericEntity(
-    Collection<User> items)
-  {
-    return new GenericEntity<Collection<User>>(items) {}
-    ;
-  }
-
-  @Override
-  protected void preCreate(User user)
-  {
-    encryptPassword(user);
-  }
-  
-  @Override
-  protected void preUpdate(User user)
-  {
-    if (DUMMY_PASSWORT.equals(user.getPassword()))
-    {
-      User o = manager.get(user.getName());
-
-      AssertUtil.assertIsNotNull(o);
-      user.setPassword(o.getPassword());
-    }
-    else
-    {
-      encryptPassword(user);
-    }
-  }
-
-  @Override
-  protected Collection<User> prepareForReturn(Collection<User> users)
-  {
-    if (Util.isNotEmpty(users))
-    {
-      for (User u : users)
-      {
-        u.setPassword(DUMMY_PASSWORT);
-      }
-    }
-
-    return users;
-  }
-
-  @Override
-  protected User prepareForReturn(User user)
-  {
-    user.setPassword(DUMMY_PASSWORT);
-
-    return user;
-  }
-
-  @Override
-  protected String getId(User user)
-  {
-    return user.getName();
-  }
-
-  @Override
-  protected String getPathPart()
-  {
-    return PATH_PART;
-  }
-
-  private void encryptPassword(User user)
-  {
-    String password = user.getPassword();
-
-    if (Util.isNotEmpty(password))
-    {
-      user.setPassword(passwordService.encryptPassword(password));
-    }
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private PasswordService passwordService;
-}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/AuthenticationResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/AuthenticationResource.java
index ffe0ce51d0..47918080ab 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/AuthenticationResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/AuthenticationResource.java
@@ -18,6 +18,7 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 @Path(AuthenticationResource.PATH)
+@AllowAnonymousAccess
 public class AuthenticationResource {
 
   private static final Logger LOG = LoggerFactory.getLogger(AuthenticationResource.class);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexResource.java
index 088558c7dc..1eec99ea96 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexResource.java
@@ -1,6 +1,7 @@
 package sonia.scm.api.v2.resources;
 
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
+import sonia.scm.security.AllowAnonymousAccess;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
@@ -9,6 +10,7 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 
 @Path(IndexResource.INDEX_PATH_V2)
+@AllowAnonymousAccess
 public class IndexResource {
   public static final String INDEX_PATH_V2 = "v2/";
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UIPluginResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UIPluginResource.java
index a76c39dd69..b83f5310e3 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UIPluginResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UIPluginResource.java
@@ -5,6 +5,7 @@ import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
 import sonia.scm.plugin.PluginLoader;
 import sonia.scm.plugin.PluginWrapper;
+import sonia.scm.security.AllowAnonymousAccess;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
@@ -17,6 +18,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+@AllowAnonymousAccess
 public class UIPluginResource {
 
   private final PluginLoader pluginLoader;
diff --git a/scm-webapp/src/main/java/sonia/scm/filter/AdminSecurityFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/AdminSecurityFilter.java
deleted file mode 100644
index a5455c6d21..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/filter/AdminSecurityFilter.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.filter;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.inject.Inject;
-
-import org.apache.shiro.subject.Subject;
-
-import sonia.scm.Priority;
-import sonia.scm.config.ScmConfiguration;
-import sonia.scm.security.Role;
-
-/**
- * Security filter which allow only administrators to access the underlying
- * resources.
- * 
- * @author Sebastian Sdorra
- */
-// TODO before releasing v2, delete this filter (we use Permission objects now)
-@WebElement(
-  value = Filters.PATTERN_CONFIG,
-  morePatterns = { 
-    Filters.PATTERN_USERS, 
-    Filters.PATTERN_GROUPS,
-    Filters.PATTERN_PLUGINS 
-  }
-)
-@Priority(Filters.PRIORITY_AUTHORIZATION + 1)
-public class AdminSecurityFilter extends SecurityFilter
-{
-
-  /**
-   * Constructs a new instance.
-   *
-   * @param configuration scm-manager main configuration
-   */
-  @Inject
-  public AdminSecurityFilter(ScmConfiguration configuration)
-  {
-    super(configuration);
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Returns {@code true} if the subject has the admin role.
-   *
-   * @param subject subject
-   * 
-   * @return {@code true} if the subject has the admin role
-   */
-  @Override
-  protected boolean hasPermission(Subject subject)
-  {
-    return subject.hasRole(Role.ADMIN);
-  }
-}
diff --git a/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java
index d97a5b050e..ea647a4b04 100644
--- a/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java
@@ -62,8 +62,7 @@ import static sonia.scm.api.v2.resources.ScmPathInfo.REST_API_PATH;
  */
 @Priority(Filters.PRIORITY_AUTHORIZATION)
 // TODO find a better way for unprotected resources
-@WebElement(value = REST_API_PATH + "" +
-  "/(?!v2/ui).*", regex = true)
+@WebElement(value = REST_API_PATH + "/(?!v2/ui).*", regex = true)
 public class SecurityFilter extends HttpFilter
 {
 
@@ -84,31 +83,16 @@ public class SecurityFilter extends HttpFilter
     HttpServletResponse response, FilterChain chain)
     throws IOException, ServletException
   {
-    if (!SecurityRequests.isAuthenticationRequest(request) && !SecurityRequests.isIndexRequest(request))
+    Subject subject = SecurityUtils.getSubject();
+    if (hasPermission(subject))
     {
-      Subject subject = SecurityUtils.getSubject();
-      if (hasPermission(subject))
-      {
-        // add primary principal as request attribute
-        // see https://goo.gl/JRjNmf
-        String username = getUsername(subject);
-        request.setAttribute(ATTRIBUTE_REMOTE_USER, username);
+      // add primary principal as request attribute
+      // see https://goo.gl/JRjNmf
+      String username = getUsername(subject);
+      request.setAttribute(ATTRIBUTE_REMOTE_USER, username);
 
-        // wrap servlet request to provide authentication informations
-        chain.doFilter(new SecurityHttpServletRequestWrapper(request, username), response);
-      }
-      else if (subject.isAuthenticated() || subject.isRemembered())
-      {
-        response.sendError(HttpServletResponse.SC_FORBIDDEN);
-      }
-      else if (configuration.isAnonymousAccessEnabled())
-      {
-        response.sendError(HttpServletResponse.SC_FORBIDDEN);
-      }
-      else
-      {
-        response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
-      }
+      // wrap servlet request to provide authentication information
+      chain.doFilter(new SecurityHttpServletRequestWrapper(request, username), response);
     }
     else
     {
@@ -116,7 +100,7 @@ public class SecurityFilter extends HttpFilter
     }
   }
 
-  protected boolean hasPermission(Subject subject)
+  private boolean hasPermission(Subject subject)
   {
     return ((configuration != null)
       && configuration.isAnonymousAccessEnabled()) || subject.isAuthenticated()
@@ -139,5 +123,4 @@ public class SecurityFilter extends HttpFilter
 
     return username;
   }
-
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/security/AllowAnonymousAccess.java b/scm-webapp/src/main/java/sonia/scm/security/AllowAnonymousAccess.java
new file mode 100644
index 0000000000..86d9bf92ad
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/security/AllowAnonymousAccess.java
@@ -0,0 +1,11 @@
+package sonia.scm.security;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AllowAnonymousAccess {
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/security/SecurityInterceptor.java b/scm-webapp/src/main/java/sonia/scm/security/SecurityInterceptor.java
index 56e8ff5fc4..e055590bba 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/SecurityInterceptor.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/SecurityInterceptor.java
@@ -2,11 +2,28 @@ package sonia.scm.security;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.subject.Subject;
 
 public class SecurityInterceptor implements MethodInterceptor {
 
   @Override
   public Object invoke(MethodInvocation methodInvocation) throws Throwable {
-    return methodInvocation.proceed();
+    if (hasPermission() || anonymousAccessIsAllowed(methodInvocation)) {
+      return methodInvocation.proceed();
+    } else {
+      throw new AuthenticationException();
+    }
+  }
+
+  private boolean anonymousAccessIsAllowed(MethodInvocation methodInvocation) {
+    return methodInvocation.getMethod().isAnnotationPresent(AllowAnonymousAccess.class)
+      || methodInvocation.getMethod().getDeclaringClass().isAnnotationPresent(AllowAnonymousAccess.class);
+  }
+
+  private boolean hasPermission() {
+    Subject subject = SecurityUtils.getSubject();
+    return subject.isAuthenticated() || subject.isRemembered();
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/filter/AdminSecurityFilterTest.java b/scm-webapp/src/test/java/sonia/scm/filter/AdminSecurityFilterTest.java
deleted file mode 100644
index b1d7f54ec9..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/filter/AdminSecurityFilterTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Copyright (c) 2014, Sebastian Sdorra
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * http://bitbucket.org/sdorra/scm-manager
- * 
- */
-
-package sonia.scm.filter;
-
-import com.github.sdorra.shiro.ShiroRule;
-import com.github.sdorra.shiro.SubjectAware;
-import org.apache.shiro.SecurityUtils;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-import sonia.scm.config.ScmConfiguration;
-
-/**
- * Unit tests for {@link AdminSecurityFilter}.
- * 
- * @author Sebastian Sdorra
- */
-@RunWith(MockitoJUnitRunner.class)
-@SubjectAware(configuration = "classpath:sonia/scm/shiro-001.ini")
-public class AdminSecurityFilterTest {
-  
-  private AdminSecurityFilter securityFilter;
-  
-  @Rule
-  public ShiroRule shiro = new ShiroRule();
-  
-  /**
-   * Prepare object under test and mocks.
-   */
-  @Before
-  public void setUp(){
-    this.securityFilter = new AdminSecurityFilter(new ScmConfiguration());
-  }
-
-  /**
-   * Tests {@link AdminSecurityFilter#hasPermission(org.apache.shiro.subject.Subject)} as administrator.
-   */
-  @Test
-  @SubjectAware(username = "dent", password = "secret")
-  public void testHasPermissionAsAdministrator() {
-    assertTrue(securityFilter.hasPermission(SecurityUtils.getSubject()));
-  }
-
-  /**
-   * Tests {@link AdminSecurityFilter#hasPermission(org.apache.shiro.subject.Subject)} as user.
-   */
-  @Test
-  @SubjectAware(username = "trillian", password = "secret")
-  public void testHasPermissionAsUser() {
-    assertFalse(securityFilter.hasPermission(SecurityUtils.getSubject()));
-  }
-
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/filter/SecurityFilterTest.java b/scm-webapp/src/test/java/sonia/scm/filter/SecurityFilterTest.java
index 50aa6980f6..6badc0b7b0 100644
--- a/scm-webapp/src/test/java/sonia/scm/filter/SecurityFilterTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/filter/SecurityFilterTest.java
@@ -33,30 +33,30 @@ package sonia.scm.filter;
 
 import com.github.sdorra.shiro.ShiroRule;
 import com.github.sdorra.shiro.SubjectAware;
-import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.shiro.subject.SimplePrincipalCollection;
 import org.apache.shiro.subject.Subject;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.hamcrest.Matchers.*;
 import org.junit.Before;
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
-import static org.mockito.Mockito.*;
 import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.SCMContext;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.user.User;
 import sonia.scm.user.UserTestData;
 
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.verify;
+
 /**
  * Unit tests for {@link SecurityFilter}.
  * 
@@ -95,37 +95,6 @@ public class SecurityFilterTest {
   public void setUp(){
     this.configuration = new ScmConfiguration();
     this.securityFilter = new SecurityFilter(configuration);
-    
-    when(request.getContextPath()).thenReturn("/scm");
-  }
-  
-  /**
-   * Tests filter on authentication endpoint v1.
-   *
-   * @throws IOException
-   * @throws ServletException 
-   */
-  @Test
-  public void testDoOnAuthenticationUrlV1() throws IOException, ServletException {
-    checkIfAuthenticationUrlIsPassedThrough("/scm/api/auth/access_token");
-  }
-
-  /**
-   * Tests filter on authentication endpoint v2.
-   *
-   * @throws IOException
-   * @throws ServletException
-   */
-  @Test
-  public void testDoOnAuthenticationUrlV2() throws IOException, ServletException {
-    checkIfAuthenticationUrlIsPassedThrough("/scm/api/v2/auth/access_token");
-  }
-
-  private void checkIfAuthenticationUrlIsPassedThrough(String uri) throws IOException, ServletException {
-    when(request.getRequestURI()).thenReturn(uri);
-    securityFilter.doFilter(request, response, chain);
-    verify(request, never()).setAttribute(Mockito.anyString(), Mockito.any());
-    verify(chain).doFilter(request, response);
   }
   
   /**
@@ -136,7 +105,6 @@ public class SecurityFilterTest {
    */
   @Test
   public void testAnonymous() throws IOException, ServletException {
-    when(request.getRequestURI()).thenReturn("/scm/api");
     securityFilter.doFilter(request, response, chain);
     response.sendError(HttpServletResponse.SC_FORBIDDEN);
   }
@@ -149,7 +117,6 @@ public class SecurityFilterTest {
    */
   @Test
   public void testAnonymousWithAccessEnabled() throws IOException, ServletException {
-    when(request.getRequestURI()).thenReturn("/scm/api");
     configuration.setAnonymousAccessEnabled(true);
     
     // execute
@@ -173,8 +140,7 @@ public class SecurityFilterTest {
   @Test
   public void testAuthenticated() throws IOException, ServletException {
     authenticateUser(UserTestData.createTrillian());
-    when(request.getRequestURI()).thenReturn("/scm/api");
-    
+
     // execute
     securityFilter.doFilter(request, response, chain);
     
@@ -187,42 +153,6 @@ public class SecurityFilterTest {
     assertEquals("trillian", captured.getRemoteUser());
   }
   
-  /**
-   * Tests filter without permissions.
-   * 
-   * @throws IOException
-   * @throws ServletException
-   */
-  @Test
-  public void testForbidden() throws IOException, ServletException {
-    authenticateUser(UserTestData.createTrillian());
-    when(request.getRequestURI()).thenReturn("/scm/api");
-    
-    // execute
-    securityFilter = new AccessForbiddenSecurityFilter(configuration);
-    securityFilter.doFilter(request, response, chain);
-    
-    // assert
-    verify(response).sendError(HttpServletResponse.SC_FORBIDDEN);
-  }
-  
-  /**
-   * Tests filter unauthenticated and without permissions.
-   * 
-   * @throws IOException
-   * @throws ServletException
-   */
-  @Test
-  public void testUnauthorized() throws IOException, ServletException {
-    when(request.getRequestURI()).thenReturn("/scm/api");
-    
-    // execute
-    securityFilter = new AccessForbiddenSecurityFilter(configuration);
-    securityFilter.doFilter(request, response, chain);
-    
-    // assert
-    verify(response).sendError(HttpServletResponse.SC_UNAUTHORIZED);
-  }
 
   private void authenticateUser(User user) {
     SimplePrincipalCollection spc = new SimplePrincipalCollection();
@@ -236,18 +166,4 @@ public class SecurityFilterTest {
     
     shiro.setSubject(subject);
   }
-  
-  private static class AccessForbiddenSecurityFilter extends SecurityFilter {
-    
-    private AccessForbiddenSecurityFilter(ScmConfiguration configuration) {
-      super(configuration);
-    }
-
-    @Override
-    protected boolean hasPermission(Subject subject) {
-      return false;
-    }
-    
-  }
-
 }

From 1002db3a4bffb3ce00c9bb1725a866179c261a39 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sat, 10 Nov 2018 14:19:04 +0100
Subject: [PATCH 170/188] disable default ui linking for plugins, enable it
 only for core plugins

---
 scm-plugins/pom.xml                |  6 ------
 scm-plugins/scm-git-plugin/pom.xml |  4 ++++
 scm-plugins/scm-hg-plugin/pom.xml  | 22 +++++++++++++---------
 scm-plugins/scm-svn-plugin/pom.xml | 16 ++++++++++------
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml
index 94d751dff7..db0173d1df 100644
--- a/scm-plugins/pom.xml
+++ b/scm-plugins/pom.xml
@@ -115,12 +115,6 @@
         <artifactId>smp-maven-plugin</artifactId>
         <version>1.0.0-alpha-3</version>
         <extensions>true</extensions>
-        <configuration>
-          <links>
-            <link>@scm-manager/ui-types</link>
-            <link>@scm-manager/ui-components</link>
-          </links>
-        </configuration>
       </plugin>
 
     <plugin>
diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml
index bf8769daca..a838e2f146 100644
--- a/scm-plugins/scm-git-plugin/pom.xml
+++ b/scm-plugins/scm-git-plugin/pom.xml
@@ -52,6 +52,10 @@
         <extensions>true</extensions>
         <configuration>
           <corePlugin>true</corePlugin>
+          <links>
+            <link>@scm-manager/ui-types</link>
+            <link>@scm-manager/ui-components</link>
+          </links>
         </configuration>
       </plugin>
 
diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml
index 8dcc653642..6b7664c140 100644
--- a/scm-plugins/scm-hg-plugin/pom.xml
+++ b/scm-plugins/scm-hg-plugin/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-      
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -16,7 +16,7 @@
   <description>Plugin for the version control system Mercurial</description>
 
   <dependencies>
-    
+
     <dependency>
       <groupId>com.aragost.javahg</groupId>
       <artifactId>javahg</artifactId>
@@ -30,10 +30,10 @@
     </dependency>
 
   </dependencies>
-  
+
   <build>
     <plugins>
-      
+
       <plugin>
         <groupId>com.mycila.maven-license-plugin</groupId>
         <artifactId>maven-license-plugin</artifactId>
@@ -59,6 +59,10 @@
         <extensions>true</extensions>
         <configuration>
           <corePlugin>true</corePlugin>
+          <links>
+            <link>@scm-manager/ui-types</link>
+            <link>@scm-manager/ui-components</link>
+          </links>
         </configuration>
       </plugin>
 
@@ -80,15 +84,15 @@
 
     </plugins>
   </build>
-  
+
   <repositories>
-    
+
     <repository>
       <id>maven.scm-manager.org</id>
       <name>scm-manager release repository</name>
       <url>http://maven.scm-manager.org/nexus/content/groups/public</url>
     </repository>
-    
+
     <repository>
       <releases>
         <enabled>false</enabled>
@@ -101,7 +105,7 @@
       <layout>default</layout>
       <url>https://oss.sonatype.org/content/groups/public/</url>
     </repository>
-  
+
   </repositories>
- 
+
 </project>
diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml
index 395def8c27..4386efde5b 100644
--- a/scm-plugins/scm-svn-plugin/pom.xml
+++ b/scm-plugins/scm-svn-plugin/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  
+
   <parent>
     <artifactId>scm-plugins</artifactId>
     <groupId>sonia.scm.plugins</groupId>
@@ -28,7 +28,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-    
+
     <dependency>
       <groupId>sonia.svnkit</groupId>
       <artifactId>svnkit-dav</artifactId>
@@ -36,7 +36,7 @@
     </dependency>
 
   </dependencies>
-  
+
   <build>
     <plugins>
 
@@ -45,6 +45,10 @@
         <artifactId>smp-maven-plugin</artifactId>
         <configuration>
           <corePlugin>true</corePlugin>
+          <links>
+            <link>@scm-manager/ui-types</link>
+            <link>@scm-manager/ui-components</link>
+          </links>
         </configuration>
       </plugin>
 
@@ -67,19 +71,19 @@
   </build>
 
   <repositories>
-    
+
     <repository>
       <id>maven.tmatesoft.com</id>
       <name>tmatesoft release repository</name>
       <url>https://maven.tmatesoft.com/content/repositories/releases</url>
     </repository>
-      
+
     <repository>
       <id>maven.scm-manager.org</id>
       <name>scm-manager release repository</name>
       <url>http://maven.scm-manager.org/nexus/content/groups/public</url>
     </repository>
-  
+
   </repositories>
 
 </project>

From 451a170cb2c15c81c7c5b2d6961a11d23052bf07 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sat, 10 Nov 2018 14:20:55 +0100
Subject: [PATCH 171/188] implemented deployment for scm-ui-components

---
 scm-ui-components/package.json                |   7 +-
 .../packages/ui-components/package.json       |   6 +-
 .../packages/ui-types/package.json            |  16 +-
 .../packages/ui-types/yarn-error.log          |  52 -
 scm-ui-components/pom.xml                     |  10 +
 scm-ui-components/scripts/publish.js          | 140 +++
 scm-ui-components/yarn.lock                   | 930 ++++++++++++++----
 7 files changed, 932 insertions(+), 229 deletions(-)
 delete mode 100644 scm-ui-components/packages/ui-types/yarn-error.log
 create mode 100644 scm-ui-components/scripts/publish.js

diff --git a/scm-ui-components/package.json b/scm-ui-components/package.json
index 527acbd9dc..bddbaba1c5 100644
--- a/scm-ui-components/package.json
+++ b/scm-ui-components/package.json
@@ -1,13 +1,16 @@
 {
   "name": "scm-ui-components",
+  "version": "0.0.3",
   "description": "Lerna root for SCM-Manager UI Components",
   "private": true,
   "scripts": {
     "bootstrap": "lerna bootstrap",
     "link": "lerna exec -- yarn link",
-    "unlink": "lerna exec --no-bail -- yarn unlink || true"
+    "unlink": "lerna exec --no-bail -- yarn unlink || true",
+    "deploy": "node ./scripts/publish.js"
   },
   "devDependencies": {
-    "lerna": "^3.2.1"
+    "lerna": "^3.4.3",
+    "xml2js": "^0.4.19"
   }
 }
diff --git a/scm-ui-components/packages/ui-components/package.json b/scm-ui-components/packages/ui-components/package.json
index e176a3d46d..823ca7143e 100644
--- a/scm-ui-components/packages/ui-components/package.json
+++ b/scm-ui-components/packages/ui-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scm-manager/ui-components",
-  "version": "0.0.1",
+  "version": "2.0.0-SNAPSHOT",
   "description": "UI Components for SCM-Manager and its plugins",
   "main": "src/index.js",
   "files": [
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@scm-manager/ui-extensions": "^0.1.1",
-    "@scm-manager/ui-types": "0.0.1",
+    "@scm-manager/ui-types": "2.0.0-SNAPSHOT",
     "classnames": "^2.2.6",
     "moment": "^2.22.2",
     "react": "^16.5.2",
@@ -55,4 +55,4 @@
       ]
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/scm-ui-components/packages/ui-types/package.json b/scm-ui-components/packages/ui-types/package.json
index 3e61b9ab32..78452c2ef5 100644
--- a/scm-ui-components/packages/ui-types/package.json
+++ b/scm-ui-components/packages/ui-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scm-manager/ui-types",
-  "version": "0.0.1",
+  "version": "2.0.0-SNAPSHOT",
   "description": "Flow types for SCM-Manager related Objects",
   "main": "src/index.js",
   "files": [
@@ -8,7 +8,7 @@
   ],
   "repository": "https://bitbucket.org/sdorra/scm-manager",
   "author": "Sebastian Sdorra <sebastian.sdorra@cloudogu.com>",
-  "license" : "BSD-3-Clause",
+  "license": "BSD-3-Clause",
   "scripts": {
     "lint": "ui-bunder lint",
     "check": "flow check"
@@ -21,10 +21,16 @@
       [
         "babelify",
         {
-          "plugins": ["@babel/plugin-proposal-class-properties"],
-          "presets": ["@babel/preset-env", "@babel/preset-flow", "@babel/preset-react"]
+          "plugins": [
+            "@babel/plugin-proposal-class-properties"
+          ],
+          "presets": [
+            "@babel/preset-env",
+            "@babel/preset-flow",
+            "@babel/preset-react"
+          ]
         }
       ]
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/scm-ui-components/packages/ui-types/yarn-error.log b/scm-ui-components/packages/ui-types/yarn-error.log
deleted file mode 100644
index b799a25089..0000000000
--- a/scm-ui-components/packages/ui-types/yarn-error.log
+++ /dev/null
@@ -1,52 +0,0 @@
-Arguments: 
-  /usr/bin/node /home/ssdorra/.yarn/bin/yarn.js add --dev ui-bundler
-
-PATH: 
-  /home/ssdorra/.yarn/bin:/usr/local/go/bin:/home/ssdorra/Projects/go/bin:/home/ssdorra/.local/bin:/usr/local/google-cloud-sdk/bin:/usr/local/go/bin:/home/ssdorra/.sdkman/candidates/maven/current/bin:/home/ssdorra/.sdkman/candidates/groovy/current/bin:/home/ssdorra/bin:/home/ssdorra/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/usr/lib/jvm/java-8-oracle/bin:/usr/lib/jvm/java-8-oracle/db/bin:/usr/lib/jvm/java-8-oracle/jre/bin:/home/ssdorra/Projects/go/bin
-
-Yarn version: 
-  1.9.2
-
-Node version: 
-  8.11.4
-
-Platform: 
-  linux x64
-
-Trace: 
-  Error: https://registry.yarnpkg.com/ui-bundler: Not found
-      at Request.params.callback [as _callback] (/home/ssdorra/.yarn/lib/cli.js:64150:18)
-      at Request.self.callback (/home/ssdorra/.yarn/lib/cli.js:137416:22)
-      at emitTwo (events.js:126:13)
-      at Request.emit (events.js:214:7)
-      at Request.<anonymous> (/home/ssdorra/.yarn/lib/cli.js:138388:10)
-      at emitOne (events.js:116:13)
-      at Request.emit (events.js:211:7)
-      at IncomingMessage.<anonymous> (/home/ssdorra/.yarn/lib/cli.js:138310:12)
-      at Object.onceWrapper (events.js:313:30)
-      at emitNone (events.js:111:20)
-
-npm manifest: 
-  {
-    "name": "@scm-manager/ui-types",
-    "version": "0.0.1",
-    "description": "Flow types for SCM-Manager related Objects",
-    "main": "src/index.js",
-    "files": [
-      "src"
-    ],
-    "repository": "https://bitbucket.org/sdorra/scm-manager",
-    "author": "Sebastian Sdorra <sebastian.sdorra@cloudogu.com>",
-    "license": "MIT",
-    "scripts": {
-      "check": "flow check"
-    },
-    "devDependencies": {}
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
-  # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-  # yarn lockfile v1
diff --git a/scm-ui-components/pom.xml b/scm-ui-components/pom.xml
index f5544a9e24..3d4e31a50a 100644
--- a/scm-ui-components/pom.xml
+++ b/scm-ui-components/pom.xml
@@ -68,6 +68,16 @@
               <script>link</script>
             </configuration>
           </execution>
+          <execution>
+            <id>deploy</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <script>deploy</script>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
 
diff --git a/scm-ui-components/scripts/publish.js b/scm-ui-components/scripts/publish.js
new file mode 100644
index 0000000000..9eaae6fede
--- /dev/null
+++ b/scm-ui-components/scripts/publish.js
@@ -0,0 +1,140 @@
+const fs = require("fs");
+const path = require("path");
+const {spawn} = require("child_process");
+const parseString = require('xml2js').parseString;
+
+function isSnapshot(version) {
+  return version.indexOf("SNAPSHOT") > 0;
+}
+
+function createSnapshotVersion(version) {
+  const date = new Date();
+  const year = date.getFullYear();
+  const month = date.getMonth().toString().padStart(2, "0");
+  const day = date.getDate().toString().padStart(2, "0");
+
+  const hours = date.getHours().toString().padStart(2, "0");
+  const minutes = date.getMinutes().toString().padStart(2, "0");
+  const seconds = date.getSeconds().toString().padStart(2, "0");
+
+  return version.replace("SNAPSHOT", `${year}${month}${day}-${hours}${minutes}${seconds}`);
+}
+
+function createVersionForPublishing(version) {
+  if (isSnapshot(version)) {
+    return createSnapshotVersion(version);
+  }
+  return version;
+}
+
+function publishPackages(version) {
+  console.log(`publish ${version} of all packages`);
+  return new Promise((resolve, reject) => {
+    const lerna = spawn("lerna", [
+      "exec", "--", "yarn", "publish", "--new-version", version, "--access", "public"
+    ], {
+      stdio: [
+        process.stdin,
+        process.stdout,
+        process.stderr
+      ]
+    });
+
+    lerna.on('close', (code) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error("publishing of packages failed with status code: " + code));
+      }
+    });
+  });
+}
+
+function setVersion(package, packages, newVersion) {
+  return new Promise((resolve, reject) => {
+    const packageJsonPath = path.join(package, "package.json");
+    fs.readFile(packageJsonPath, "utf-8" , (err, content) => {
+      if (err) {
+        reject(err);
+      } else {
+        const packageJson = JSON.parse(content);
+        packageJson.version = newVersion;
+
+        for (let dep in packageJson.dependencies) {
+          if (packages.indexOf(dep) >= 0) {
+            packageJson.dependencies[ dep ] = newVersion;
+          }
+        }
+
+        fs.writeFile( packageJsonPath, JSON.stringify(packageJson, null, 2), (err) => {
+          if (err) {
+            reject(err)
+          } else {
+            console.log("modified", packageJsonPath);
+            resolve();
+          }
+        });
+      }
+    });
+  });
+}
+
+function setVersions(newVersion) {
+  console.log("set versions of packages to", newVersion);
+  return new Promise((resolve, reject) => {
+    fs.readdir("packages", (err, packages) => {
+      if ( err ) {
+        reject(err);
+      } else {
+        const actions = [];
+        const packagesWithOrg = packages.map((name) => `@scm-manager/${name}`);
+        for (let pkg of packages) {
+          const action = setVersion(path.join("packages", pkg), packagesWithOrg, newVersion);
+          actions.push(action);
+        }
+  
+        resolve(Promise.all(actions));
+      }
+    });
+  });
+}
+
+function getVersion() {
+  return new Promise((resolve, reject) => {
+    fs.readFile("pom.xml", "utf8", (err, xml) => {
+      if (err) {
+        reject(err);
+      } else {
+        
+        parseString(xml, function (err, json) {
+          if (err) {
+            reject(err)
+          } else {
+            const project = json.project;
+      
+            let version = project.version;
+            if (!version) {
+              version = project.parent.version;
+            }
+            version = version[0];
+
+            resolve(version)
+          }
+      
+        });
+
+      }
+    });
+  });
+}
+
+getVersion()
+  .then(version => {
+    const publishVersion = createVersionForPublishing(version);
+    return setVersions(publishVersion)
+      .then(() => publishPackages(publishVersion))
+      .then(() => setVersions(version));
+  })
+  .catch((err) => {
+    throw err;
+  });
diff --git a/scm-ui-components/yarn.lock b/scm-ui-components/yarn.lock
index eb7d40a3b3..2862a46547 100644
--- a/scm-ui-components/yarn.lock
+++ b/scm-ui-components/yarn.lock
@@ -5,6 +5,7 @@
 "@lerna/add@^3.4.1":
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.4.1.tgz#d41068317e30f530df48220d256b5e79690b1877"
+  integrity sha512-Vf54B42jlD6G52qnv/cAGH70cVQIa+LX//lfsbkxHvzkhIqBl5J4KsnTOPkA9uq3R+zP58ayicCHB9ReiEWGJg==
   dependencies:
     "@lerna/bootstrap" "^3.4.1"
     "@lerna/command" "^3.3.0"
@@ -20,6 +21,7 @@
 "@lerna/batch-packages@^3.1.2":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.1.2.tgz#74b5312a01a8916204cbc71237ffbe93144b99df"
+  integrity sha512-HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ==
   dependencies:
     "@lerna/package-graph" "^3.1.2"
     "@lerna/validation-error" "^3.0.0"
@@ -28,6 +30,7 @@
 "@lerna/bootstrap@^3.4.1":
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.4.1.tgz#10635e9b547fb7d685949ac78e0923f73da2f52a"
+  integrity sha512-yZDJgNm/KDoRH2klzmQGmpWMg/XMzWgeWvauXkrfW/mj1wwmufOuh5pN4fBFxVmUUa/RFZdfMeaaJt3+W3PPBw==
   dependencies:
     "@lerna/batch-packages" "^3.1.2"
     "@lerna/command" "^3.3.0"
@@ -56,6 +59,7 @@
 "@lerna/changed@^3.4.1":
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.4.1.tgz#84a049359a53b8812c3a07a664bd41b1768f5938"
+  integrity sha512-gT7fhl4zQWyGETDO4Yy5wsFnqNlBSsezncS1nkMW1uO6jwnolwYqcr1KbrMR8HdmsZBn/00Y0mRnbtbpPPey8w==
   dependencies:
     "@lerna/collect-updates" "^3.3.2"
     "@lerna/command" "^3.3.0"
@@ -66,6 +70,7 @@
 "@lerna/check-working-tree@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.3.0.tgz#2118f301f28ccb530812e5b27a341b1e6b3c84e2"
+  integrity sha512-oeEP1dNhiiKUaO0pmcIi73YXJpaD0n5JczNctvVNZ8fGZmrALZtEnmC28o6Z7JgQaqq5nd2kO7xbnjoitrC51g==
   dependencies:
     "@lerna/describe-ref" "^3.3.0"
     "@lerna/validation-error" "^3.0.0"
@@ -73,6 +78,7 @@
 "@lerna/child-process@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.3.0.tgz#71184a763105b6c8ece27f43f166498d90fe680f"
+  integrity sha512-q2d/OPlNX/cBXB6Iz1932RFzOmOHq6ZzPjqebkINNaTojHWuuRpvJJY4Uz3NGpJ3kEtPDvBemkZqUBTSO5wb1g==
   dependencies:
     chalk "^2.3.1"
     execa "^1.0.0"
@@ -81,6 +87,7 @@
 "@lerna/clean@^3.3.2":
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.3.2.tgz#9a7e8a1e400e580de260fa124945b2939a025069"
+  integrity sha512-mvqusgSp2ou5SGqQgTEoTvGJpGfH4+L6XSeN+Ims+eNFGXuMazmKCf+rz2PZBMFufaHJ/Os+JF0vPCcWI1Fzqg==
   dependencies:
     "@lerna/command" "^3.3.0"
     "@lerna/filter-options" "^3.3.2"
@@ -93,6 +100,7 @@
 "@lerna/cli@^3.2.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-3.2.0.tgz#3ed25bcbc0b8f0878bc6a102ee0296f01476cfdf"
+  integrity sha512-JdbLyTxHqxUlrkI+Ke+ltXbtyA+MPu9zR6kg/n8Fl6uaez/2fZWtReXzYi8MgLxfUFa7+1OHWJv4eAMZlByJ+Q==
   dependencies:
     "@lerna/global-options" "^3.1.3"
     dedent "^0.7.0"
@@ -102,6 +110,7 @@
 "@lerna/collect-updates@^3.3.2":
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.3.2.tgz#54df5ce59ca05e8aa04ff8a9299f89cc253a9304"
+  integrity sha512-9WyBJI2S5sYgEZEScu525Lbi6nknNrdBKop35sCDIC9y6AIGvH6Dr5tkTd+Kg3n1dE+kHwW/xjERkx3+h7th3w==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     "@lerna/describe-ref" "^3.3.0"
@@ -112,6 +121,7 @@
 "@lerna/command@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.3.0.tgz#e81c4716a676b02dbe9d3f548d5f45b4ba32c25a"
+  integrity sha512-NTOkLEKlWcBLHSvUr9tzVpV7RJ4GROLeOuZ6RfztGOW/31JPSwVVBD2kPifEXNZunldOx5GVWukR+7+NpAWhsg==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     "@lerna/package-graph" "^3.1.2"
@@ -127,6 +137,7 @@
 "@lerna/conventional-commits@^3.4.1":
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.4.1.tgz#0b47f9fc0c4a10951883e949d939188da1b527bc"
+  integrity sha512-3NETrA58aUkaEW3RdwdJ766Bg9NVpLzb26mtdlsJQcvB5sQBWH5dJSHIVQH1QsGloBeH2pE/mDUEVY8ZJXuR4w==
   dependencies:
     "@lerna/validation-error" "^3.0.0"
     conventional-changelog-angular "^5.0.1"
@@ -141,6 +152,7 @@
 "@lerna/create-symlink@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.3.0.tgz#91de00fd576018ba4251f0c6a5b4b7f768f22a82"
+  integrity sha512-0lb88Nnq1c/GG+fwybuReOnw3+ah4dB81PuWwWwuqUNPE0n50qUf/M/7FfSb5JEh/93fcdbZI0La8t3iysNW1w==
   dependencies:
     cmd-shim "^2.0.2"
     fs-extra "^7.0.0"
@@ -149,6 +161,7 @@
 "@lerna/create@^3.4.1":
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.4.1.tgz#7cad78a5701d7666a0f5d0fe0e325acd8d8f5b63"
+  integrity sha512-l+4t2SRO5nvW0MNYY+EWxbaMHsAN8bkWH3nyt7EzhBjs4+TlRAJRIEqd8o9NWznheE3pzwczFz1Qfl3BWbyM5A==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     "@lerna/command" "^3.3.0"
@@ -170,6 +183,7 @@
 "@lerna/describe-ref@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.3.0.tgz#d373adb530d5428ab91e303ccbfcf51a98374a3a"
+  integrity sha512-4t7M4OupnYMSPNLrLUau8qkS+dgLEi4w+DkRkV0+A+KNYga1W0jVgNLPIIsxta7OHfodPkCNAqZCzNCw/dmAwA==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     npmlog "^4.1.2"
@@ -177,6 +191,7 @@
 "@lerna/diff@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.3.0.tgz#c8130a5f508b47fad5fec81404498bc3acdf9cb5"
+  integrity sha512-sIoMjsm3NVxvmt6ofx8Uu/2fxgldQqLl0zmC9X1xW00j831o5hBffx1EoKj9CnmaEvoSP6j/KFjxy2RWjebCIg==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     "@lerna/command" "^3.3.0"
@@ -186,6 +201,7 @@
 "@lerna/exec@^3.3.2":
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.3.2.tgz#95ecaca617fd85abdb91e9a378ed06ec1763d665"
+  integrity sha512-mN6vGxNir7JOGvWLwKr3DW3LNy1ecCo2ziZj5rO9Mw5Rew3carUu1XLmhF/4judtsvXViUY+rvGIcqHe0vvb+w==
   dependencies:
     "@lerna/batch-packages" "^3.1.2"
     "@lerna/child-process" "^3.3.0"
@@ -197,6 +213,7 @@
 "@lerna/filter-options@^3.3.2":
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.3.2.tgz#ac90702b7876ff4980dcdeaeac049c433dd01773"
+  integrity sha512-0WHqdDgAnt5WKoByi1q+lFw8HWt5tEKP2DnLlGqWv3YFwVF5DsPRlO7xbzjY9sJgvyJtZcnkMtccdBPFhGGyIQ==
   dependencies:
     "@lerna/collect-updates" "^3.3.2"
     "@lerna/filter-packages" "^3.0.0"
@@ -205,6 +222,7 @@
 "@lerna/filter-packages@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.0.0.tgz#5eb25ad1610f3e2ab845133d1f8d7d40314e838f"
+  integrity sha512-zwbY1J4uRjWRZ/FgYbtVkq7I3Nduwsg2V2HwLKSzwV2vPglfGqgovYOVkND6/xqe2BHwDX4IyA2+e7OJmLaLSA==
   dependencies:
     "@lerna/validation-error" "^3.0.0"
     multimatch "^2.1.0"
@@ -213,16 +231,19 @@
 "@lerna/get-npm-exec-opts@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.0.0.tgz#8fc7866e8d8e9a2f2dc385287ba32eb44de8bdeb"
+  integrity sha512-arcYUm+4xS8J3Palhl+5rRJXnZnFHsLFKHBxznkPIxjwGQeAEw7df38uHdVjEQ+HNeFmHnBgSqfbxl1VIw5DHg==
   dependencies:
     npmlog "^4.1.2"
 
 "@lerna/global-options@^3.1.3":
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.1.3.tgz#cf85e24655a91d04d4efc9a80c1f83fc768d08ae"
+  integrity sha512-LVeZU/Zgc0XkHdGMRYn+EmHfDmmYNwYRv3ta59iCVFXLVp7FRFWF7oB1ss/WRa9x/pYU0o6L8as/5DomLUGASA==
 
 "@lerna/has-npm-version@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.3.0.tgz#8a73c2c437a0e1e68a19ccbd0dd3c014d4d39135"
+  integrity sha512-GX7omRep1eBRZHgjZLRw3MpBJSdA5gPZFz95P7rxhpvsiG384Tdrr/cKFMhm0A09yq27Tk/nuYTaZIj7HsVE6g==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     semver "^5.5.0"
@@ -230,6 +251,7 @@
 "@lerna/import@^3.3.1":
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.3.1.tgz#deca8c93c9cc03c5844b975c6da9937dd7530440"
+  integrity sha512-2OzTQDkYKbBPpyP2iOI1sWfcvMjNLjjHjmREq/uOWJaSIk5J3Ukt71OPpcOHh4V2CBOlXidCcO+Hyb4FVIy8fw==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     "@lerna/command" "^3.3.0"
@@ -242,6 +264,7 @@
 "@lerna/init@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.3.0.tgz#998f3497da3d891867c593b808b6db4b8fc4ccb9"
+  integrity sha512-HvgRLkIG6nDIeAO6ix5sUVIVV+W9UMk2rSSmFT66CDOefRi7S028amiyYnFUK1QkIAaUbVUyOnYaErtbJwICuw==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     "@lerna/command" "^3.3.0"
@@ -252,6 +275,7 @@
 "@lerna/link@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.3.0.tgz#c0c05ff52d0f0c659fcf221627edfcd58e477a5c"
+  integrity sha512-8CeXzGL7okrsVXsy2sHXI2KuBaczw3cblAnA2+FJPUqSKMPNbUTRzeU3bOlCjYtK0LbxC4ngENJTL3jJ8RaYQQ==
   dependencies:
     "@lerna/command" "^3.3.0"
     "@lerna/package-graph" "^3.1.2"
@@ -262,6 +286,7 @@
 "@lerna/list@^3.3.2":
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.3.2.tgz#1412b3cce2a83b1baa4ff6fb962d50b46c28ec98"
+  integrity sha512-XXEVy7w+i/xx8NeJmGirw4upEoEF9OfD6XPLjISNQc24VgQV+frXdVJ02QcP7Y/PkY1rdIVrOjvo3ipKVLUxaQ==
   dependencies:
     "@lerna/command" "^3.3.0"
     "@lerna/filter-options" "^3.3.2"
@@ -271,6 +296,7 @@
 "@lerna/listable@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.0.0.tgz#27209b1382c87abdbc964220e75c247d803d4199"
+  integrity sha512-HX/9hyx1HLg2kpiKXIUc1EimlkK1T58aKQ7ovO7rQdTx9ForpefoMzyLnHE1n4XrUtEszcSWJIICJ/F898M6Ag==
   dependencies:
     chalk "^2.3.1"
     columnify "^1.5.4"
@@ -278,6 +304,7 @@
 "@lerna/log-packed@^3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.0.4.tgz#6d1f6ce5ca68b9971f2a27f0ecf3c50684be174a"
+  integrity sha512-vVQHgMagE2wnbxhNY9nFkdu+Cx2TsyWalkJfkxbNzmo6gOCrDsxCBDj9vTEV8Q+4aWx0C0Bsc0sB2Eb8y/+ofA==
   dependencies:
     byte-size "^4.0.3"
     columnify "^1.5.4"
@@ -287,6 +314,7 @@
 "@lerna/npm-conf@^3.4.1":
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.4.1.tgz#859e931b0bc9a5eed86309cc09508810c1e7d121"
+  integrity sha512-i9G6DnbCqiAqxKx2rSXej/n14qxlV/XOebL6QZonxJKzNTB+Q2wglnhTXmfZXTPJfoqimLaY4NfAEtbOXRWOXQ==
   dependencies:
     config-chain "^1.1.11"
     pify "^3.0.0"
@@ -294,6 +322,7 @@
 "@lerna/npm-dist-tag@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.3.0.tgz#e1c5ab67674216d901266a16846b21cc81ff6afd"
+  integrity sha512-EtZJXzh3w5tqXEev+EBBPrWKWWn0WgJfxm4FihfS9VgyaAW8udIVZHGkIQ3f+tBtupcAzA9Q8cQNUkGF2efwmA==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     "@lerna/get-npm-exec-opts" "^3.0.0"
@@ -302,6 +331,7 @@
 "@lerna/npm-install@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.3.0.tgz#16d00ffd668d11b2386b3ac68bdac2cf8320e533"
+  integrity sha512-WoVvKdS8ltROTGSNQwo6NDq0YKnjwhvTG4li1okcN/eHKOS3tL9bxbgPx7No0wOq5DKBpdeS9KhAfee6LFAZ5g==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     "@lerna/get-npm-exec-opts" "^3.0.0"
@@ -314,6 +344,7 @@
 "@lerna/npm-publish@^3.3.1":
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.3.1.tgz#30384665d7ee387343332ece62ca231207bbabea"
+  integrity sha512-bVTlWIcBL6Zpyzqvr9C7rxXYcoPw+l7IPz5eqQDNREj1R39Wj18OWB2KTJq8l7LIX7Wf4C2A1uT5hJaEf9BuvA==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     "@lerna/get-npm-exec-opts" "^3.0.0"
@@ -326,6 +357,7 @@
 "@lerna/npm-run-script@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.3.0.tgz#3c79601c27c67121155b20e039be53130217db72"
+  integrity sha512-YqDguWZzp4jIomaE4aWMUP7MIAJAFvRAf6ziQLpqwoQskfWLqK5mW0CcszT1oLjhfb3cY3MMfSTFaqwbdKmICg==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     "@lerna/get-npm-exec-opts" "^3.0.0"
@@ -334,12 +366,14 @@
 "@lerna/output@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.0.0.tgz#4ed4a30ed2f311046b714b3840a090990ba3ce35"
+  integrity sha512-EFxnSbO0zDEVKkTKpoCUAFcZjc3gn3DwPlyTDxbeqPU7neCfxP4rA4+0a6pcOfTlRS5kLBRMx79F2TRCaMM3DA==
   dependencies:
     npmlog "^4.1.2"
 
 "@lerna/package-graph@^3.1.2":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.1.2.tgz#b70298a3a8c82e12090da33233bf242223a38f20"
+  integrity sha512-9wIWb49I1IJmyjPdEVZQ13IAi9biGfH/OZHOC04U2zXGA0GLiY+B3CAx6FQvqkZ8xEGfqzmXnv3LvZ0bQfc1aQ==
   dependencies:
     "@lerna/validation-error" "^3.0.0"
     npm-package-arg "^6.0.0"
@@ -348,6 +382,7 @@
 "@lerna/package@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.0.0.tgz#14afc9a6cb1f7f7b23c1d7c7aa81bdac7d44c0e5"
+  integrity sha512-djzEJxzn212wS8d9znBnlXkeRlPL7GqeAYBykAmsuq51YGvaQK67Umh5ejdO0uxexF/4r7yRwgrlRHpQs8Rfqg==
   dependencies:
     npm-package-arg "^6.0.0"
     write-pkg "^3.1.0"
@@ -355,6 +390,7 @@
 "@lerna/project@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.0.0.tgz#4320d2a2b4080cabcf95161d9c48475217d8a545"
+  integrity sha512-XhDFVfqj79jG2Speggd15RpYaE8uiR25UKcQBDmumbmqvTS7xf2cvl2pq2UTvDafaJ0YwFF3xkxQZeZnFMwdkw==
   dependencies:
     "@lerna/package" "^3.0.0"
     "@lerna/validation-error" "^3.0.0"
@@ -372,13 +408,15 @@
 "@lerna/prompt@^3.3.1":
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-3.3.1.tgz#ec53f9034a7a02a671627241682947f65078ab88"
+  integrity sha512-eJhofrUCUaItMIH6et8kI7YqHfhjWqGZoTsE+40NRCfAraOMWx+pDzfRfeoAl3qeRAH2HhNj1bkYn70FbUOxuQ==
   dependencies:
     inquirer "^6.2.0"
     npmlog "^4.1.2"
 
-"@lerna/publish@^3.4.1":
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.4.1.tgz#abbbc656b3bfafc2289399a46da060b90f6baf32"
+"@lerna/publish@^3.4.3":
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.4.3.tgz#fb956ca2a871729982022889f90d0e8eb8528340"
+  integrity sha512-baeRL8xmOR25p86cAaS9mL0jdRzdv4dUo04PlK2Wes+YlL705F55cSXeC9npNie+9rGwFyLzCTQe18WdbZyLuw==
   dependencies:
     "@lerna/batch-packages" "^3.1.2"
     "@lerna/check-working-tree" "^3.3.0"
@@ -410,6 +448,7 @@
 "@lerna/resolve-symlink@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.3.0.tgz#c5d99a60cb17e2ea90b3521a0ba445478d194a44"
+  integrity sha512-KmoPDcFJ2aOK2inYHbrsiO9SodedUj0L1JDvDgirVNIjMUaQe2Q6Vi4Gh+VCJcyB27JtfHioV9R2NxU72Pk2hg==
   dependencies:
     fs-extra "^7.0.0"
     npmlog "^4.1.2"
@@ -418,6 +457,7 @@
 "@lerna/rimraf-dir@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.3.0.tgz#687e9bb3668a9e540e281302a52d9a573860f5db"
+  integrity sha512-vSqOcZ4kZduiSprbt+y40qziyN3VKYh+ygiCdnbBbsaxpdKB6CfrSMUtrLhVFrqUfBHIZRzHIzgjTdtQex1KLw==
   dependencies:
     "@lerna/child-process" "^3.3.0"
     npmlog "^4.1.2"
@@ -427,6 +467,7 @@
 "@lerna/run-lifecycle@^3.4.1":
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.4.1.tgz#6d7e44eada31cb4ec78b18ef050da0d86f6c892b"
+  integrity sha512-N/hi2srM9A4BWEkXccP7vCEbf4MmIuALF00DTBMvc0A/ccItwUpl3XNuM7+ADDRK0mkwE3hDw89lJ3A7f8oUQw==
   dependencies:
     "@lerna/npm-conf" "^3.4.1"
     npm-lifecycle "^2.0.0"
@@ -435,6 +476,7 @@
 "@lerna/run-parallel-batches@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.0.0.tgz#468704934084c74991d3124d80607857d4dfa840"
+  integrity sha512-Mj1ravlXF7AkkewKd9YFq9BtVrsStNrvVLedD/b2wIVbNqcxp8lS68vehXVOzoL/VWNEDotvqCQtyDBilCodGw==
   dependencies:
     p-map "^1.2.0"
     p-map-series "^1.0.0"
@@ -442,6 +484,7 @@
 "@lerna/run@^3.3.2":
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.3.2.tgz#f521f4a22585c90758f34a584cb1871f8bb2a83e"
+  integrity sha512-cruwRGZZWnQ5I0M+AqcoT3Xpq2wj3135iVw4n59/Op6dZu50sMFXZNLiTTTZ15k8rTKjydcccJMdPSpTHbH7/A==
   dependencies:
     "@lerna/batch-packages" "^3.1.2"
     "@lerna/command" "^3.3.0"
@@ -455,6 +498,7 @@
 "@lerna/symlink-binary@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.3.0.tgz#99ea570b21baabd61ecab27582eeb1d7b2c5f9cf"
+  integrity sha512-zRo6CimhvH/VJqCFl9T4IC6syjpWyQIxEfO2sBhrapEcfwjtwbhoGgKwucsvt4rIpFazCw63jQ/AXMT27KUIHg==
   dependencies:
     "@lerna/create-symlink" "^3.3.0"
     "@lerna/package" "^3.0.0"
@@ -465,6 +509,7 @@
 "@lerna/symlink-dependencies@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.3.0.tgz#13bcaed3e37986ab01b13498a459c7f609397dc3"
+  integrity sha512-IRngSNCmuD5uBKVv23tHMvr7Mplti0lKHilFKcvhbvhAfu6m/Vclxhkfs/uLyHzG+DeRpl/9o86SQET3h4XDhg==
   dependencies:
     "@lerna/create-symlink" "^3.3.0"
     "@lerna/resolve-symlink" "^3.3.0"
@@ -477,12 +522,14 @@
 "@lerna/validation-error@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-3.0.0.tgz#a27e90051c3ba71995e2a800a43d94ad04b3e3f4"
+  integrity sha512-5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA==
   dependencies:
     npmlog "^4.1.2"
 
 "@lerna/version@^3.4.1":
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.4.1.tgz#029448cccd3ccefb4d5f666933bd13cfb37edab0"
+  integrity sha512-oefNaQLBJSI2WLZXw5XxDXk4NyF5/ct0V9ys/J308NpgZthPgwRPjk9ZR0o1IOxW1ABi6z3E317W/dxHDjvAkg==
   dependencies:
     "@lerna/batch-packages" "^3.1.2"
     "@lerna/check-working-tree" "^3.3.0"
@@ -509,6 +556,7 @@
 "@lerna/write-log-file@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-3.0.0.tgz#2f95fee80c6821fe1ee6ccf8173d2b4079debbd2"
+  integrity sha512-SfbPp29lMeEVOb/M16lJwn4nnx5y+TwCdd7Uom9umd7KcZP0NOvpnX0PHehdonl7TyHZ1Xx2maklYuCLbQrd/A==
   dependencies:
     npmlog "^4.1.2"
     write-file-atomic "^2.3.0"
@@ -516,17 +564,20 @@
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
   dependencies:
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
 "@nodelib/fs.stat@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz#54c5a964462be3d4d78af631363c18d6fa91ac26"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
 JSONStream@^1.0.4, JSONStream@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -534,22 +585,26 @@ JSONStream@^1.0.4, JSONStream@^1.3.4:
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
 agentkeepalive@^3.4.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.1.tgz#4eba75cf2ad258fc09efd506cdb8d8c2971d35a4"
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
+  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
   dependencies:
     humanize-ms "^1.2.1"
 
 ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
@@ -559,32 +614,39 @@ ajv@^5.3.0:
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
 
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 aproba@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -592,98 +654,120 @@ are-we-there-yet@~1.1.2:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
 
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
 array-ify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+  integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
 
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asap@^2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 async@^2.5.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
     lodash "^4.17.10"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -696,22 +780,26 @@ base@^0.11.1:
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.5.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
+bluebird@^3.5.1, bluebird@^3.5.2:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
+  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -719,6 +807,7 @@ brace-expansion@^1.1.7:
 braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -734,26 +823,32 @@ braces@^2.3.1:
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
 byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
+  integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
 
 byte-size@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-4.0.3.tgz#b7c095efc68eadf82985fccd9a2df43a74fa2ccd"
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-4.0.4.tgz#29d381709f41aae0d89c631f1c81aec88cd40b23"
+  integrity sha512-82RPeneC6nqCdSwCX2hZUz3JPOvN5at/nTEw/CMf05Smu3Hrpo9Psb7LjN+k+XndNArG1EY8L4+BM3aTM4BCvw==
 
-cacache@^11.0.1, cacache@^11.0.2:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
+cacache@^11.0.1, cacache@^11.2.0:
+  version "11.3.1"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.1.tgz#d09d25f6c4aca7a6d305d141ae332613aa1d515f"
+  integrity sha512-2PEw4cRRDu+iQvBTTuttQifacYjLPhET+SYO/gEFMy8uhi+jlJREDAjSF5FWSdV/Aw5h18caHA7vMTw2c+wDzA==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
@@ -773,6 +868,7 @@ cacache@^11.0.1, cacache@^11.0.2:
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -787,10 +883,31 @@ cache-base@^1.0.1:
 call-me-maybe@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
+
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  dependencies:
+    callsites "^2.0.0"
+
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  dependencies:
+    caller-callsite "^2.0.0"
+
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
@@ -798,6 +915,7 @@ camelcase-keys@^2.0.0:
 camelcase-keys@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
   dependencies:
     camelcase "^4.1.0"
     map-obj "^2.0.0"
@@ -806,18 +924,22 @@ camelcase-keys@^4.0.0:
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 chalk@^2.0.0, chalk@^2.3.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -826,18 +948,22 @@ chalk@^2.0.0, chalk@^2.3.1:
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chownr@^1.0.1:
+chownr@^1.0.1, chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
+  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
 
 ci-info@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
+  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
 
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
@@ -847,16 +973,19 @@ class-utils@^0.3.5:
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -865,10 +994,12 @@ cliui@^4.0.0:
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
 cmd-shim@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
+  integrity sha1-b8vamUg6j9FdfTChlspp1oii79s=
   dependencies:
     graceful-fs "^4.1.2"
     mkdirp "~0.5.0"
@@ -876,14 +1007,17 @@ cmd-shim@^2.0.2:
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -891,39 +1025,39 @@ collection-visit@^1.0.0:
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 columnify@^1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  integrity sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=
   dependencies:
     strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combined-stream@1.0.6:
-  version "1.0.6"
-  resolved "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
   dependencies:
     delayed-stream "~1.0.0"
 
 commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
 compare-func@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
+  integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=
   dependencies:
     array-ify "^1.0.0"
     dot-prop "^3.0.0"
@@ -931,14 +1065,17 @@ compare-func@^1.3.1:
 component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 concat-stream@^1.5.0, concat-stream@^1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
     inherits "^2.0.3"
@@ -948,6 +1085,7 @@ concat-stream@^1.5.0, concat-stream@^1.6.0:
 config-chain@^1.1.11:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+  integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
   dependencies:
     ini "^1.3.4"
     proto-list "~1.2.1"
@@ -955,42 +1093,47 @@ config-chain@^1.1.11:
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 conventional-changelog-angular@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.1.tgz#f96431b76de453333a909decd02b15cb5bd2d364"
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.2.tgz#39d945635e03b6d0c9d4078b1df74e06163dc66a"
+  integrity sha512-yx7m7lVrXmt4nKWQgWZqxSALEiAKZhOAcbxdUaU9575mB0CzXVbgrgpfSnSP7OqWDUTYGD0YVJ0MSRdyOPgAwA==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
 
 conventional-changelog-core@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.0.tgz#96a81bb3301b4b2a3dc2851cc54c5fb674ac1942"
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.5.tgz#c2edf928539308b54fe1b90a2fc731abc021852c"
+  integrity sha512-iwqAotS4zk0wA4S84YY1JCUG7X3LxaRjJxuUo6GI4dZuIy243j5nOg/Ora35ExT4DOiw5dQbMMQvw2SUjh6moQ==
   dependencies:
-    conventional-changelog-writer "^4.0.0"
-    conventional-commits-parser "^3.0.0"
+    conventional-changelog-writer "^4.0.2"
+    conventional-commits-parser "^3.0.1"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
-    git-raw-commits "^2.0.0"
+    git-raw-commits "2.0.0"
     git-remote-origin-url "^2.0.0"
-    git-semver-tags "^2.0.0"
+    git-semver-tags "^2.0.2"
     lodash "^4.2.1"
     normalize-package-data "^2.3.5"
     q "^1.5.1"
-    read-pkg "^1.1.0"
-    read-pkg-up "^1.0.1"
+    read-pkg "^3.0.0"
+    read-pkg-up "^3.0.0"
     through2 "^2.0.0"
 
-conventional-changelog-preset-loader@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.1.tgz#d134734e0cc1b91b88b30586c5991f31442029f1"
+conventional-changelog-preset-loader@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0"
+  integrity sha512-pBY+qnUoJPXAXXqVGwQaVmcye05xi6z231QM98wHWamGAmu/ghkBprQAwmF5bdmyobdVxiLhPY3PrCfSeUNzRQ==
 
-conventional-changelog-writer@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.0.tgz#3ed983c8ef6a3aa51fe44e82c9c75e86f1b5aa42"
+conventional-changelog-writer@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.2.tgz#eb493ed84269e7a663da36e49af51c54639c9a67"
+  integrity sha512-d8/FQY/fix2xXEBUhOo8u3DCbyEw3UOQgYHxLsPDw+wHUDma/GQGAGsGtoH876WyNs32fViHmTOUrgRKVLvBug==
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^2.0.0"
+    conventional-commits-filter "^2.0.1"
     dateformat "^3.0.0"
     handlebars "^4.0.2"
     json-stringify-safe "^5.0.1"
@@ -1000,16 +1143,18 @@ conventional-changelog-writer@^4.0.0:
     split "^1.0.0"
     through2 "^2.0.0"
 
-conventional-commits-filter@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.0.tgz#a0ce1d1ff7a1dd7fab36bee8e8256d348d135651"
+conventional-commits-filter@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.1.tgz#55a135de1802f6510b6758e0a6aa9e0b28618db3"
+  integrity sha512-92OU8pz/977udhBjgPEbg3sbYzIxMDFTlQT97w7KdhR9igNqdJvy8smmedAAgn4tPiqseFloKkrVfbXCVd+E7A==
   dependencies:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.0.tgz#7f604549a50bd8f60443fbe515484b1c2f06a5c4"
+conventional-commits-parser@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.1.tgz#fe1c49753df3f98edb2285a5e485e11ffa7f2e4c"
+  integrity sha512-P6U5UOvDeidUJ8ebHVDIoXzI7gMlQ1OF/id6oUvp8cnZvOXMt1n8nYl74Ey9YMn0uVQtxmCtjPQawpsssBWtGg==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -1020,21 +1165,23 @@ conventional-commits-parser@^3.0.0:
     trim-off-newlines "^1.0.0"
 
 conventional-recommended-bump@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.1.tgz#304a45a412cfec050a10ea2e7e4a89320eaf3991"
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.4.tgz#05540584641d3da758c8863c09788fcaeb586872"
+  integrity sha512-9mY5Yoblq+ZMqJpBzgS+RpSq+SUfP2miOR3H/NR9drGf08WCrY9B6HAGJZEm6+ThsVP917VHAahSOjM6k1vhPg==
   dependencies:
     concat-stream "^1.6.0"
-    conventional-changelog-preset-loader "^2.0.1"
-    conventional-commits-filter "^2.0.0"
-    conventional-commits-parser "^3.0.0"
-    git-raw-commits "^2.0.0"
-    git-semver-tags "^2.0.0"
+    conventional-changelog-preset-loader "^2.0.2"
+    conventional-commits-filter "^2.0.1"
+    conventional-commits-parser "^3.0.1"
+    git-raw-commits "2.0.0"
+    git-semver-tags "^2.0.2"
     meow "^4.0.0"
     q "^1.5.1"
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
   dependencies:
     aproba "^1.1.1"
     fs-write-stream-atomic "^1.0.8"
@@ -1046,15 +1193,19 @@ copy-concurrently@^1.0.0:
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cosmiconfig@^5.0.2:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
+  integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==
   dependencies:
+    import-fresh "^2.0.0"
     is-directory "^0.3.1"
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
@@ -1062,6 +1213,7 @@ cosmiconfig@^5.0.2:
 cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -1072,54 +1224,64 @@ cross-spawn@^6.0.0:
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
 cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
+  integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=
   dependencies:
     number-is-nan "^1.0.0"
 
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
 debug@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
 debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
 debug@^3.1.0:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407"
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
@@ -1127,42 +1289,50 @@ decamelize-keys@^1.0.0:
 decamelize@^1.1.0, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decamelize@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
   dependencies:
     xregexp "4.0.0"
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
 defaults@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
   dependencies:
     clone "^1.0.2"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -1170,18 +1340,22 @@ define-property@^2.0.2:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
 detect-indent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
+  integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
 
 dezalgo@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
   dependencies:
     asap "^2.0.0"
     wrappy "1"
@@ -1189,6 +1363,7 @@ dezalgo@^1.0.0:
 dir-glob@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
   dependencies:
     arrify "^1.0.1"
     path-type "^3.0.0"
@@ -1196,22 +1371,26 @@ dir-glob@^2.0.0:
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc=
   dependencies:
     is-obj "^1.0.0"
 
 dot-prop@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
   dependencies:
     is-obj "^1.0.0"
 
 duplexer@^0.1.1:
   version "0.1.1"
-  resolved "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
+  integrity sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -1221,6 +1400,7 @@ duplexify@^3.4.2, duplexify@^3.6.0:
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
@@ -1228,46 +1408,55 @@ ecc-jsbn@~0.1.1:
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
   dependencies:
     iconv-lite "~0.4.13"
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
   dependencies:
     once "^1.4.0"
 
 err-code@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 es6-promise@^4.0.3:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 execa@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
   dependencies:
     cross-spawn "^6.0.0"
     get-stream "^3.0.0"
@@ -1280,6 +1469,7 @@ execa@^0.10.0:
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
   dependencies:
     cross-spawn "^6.0.0"
     get-stream "^4.0.0"
@@ -1292,6 +1482,7 @@ execa@^1.0.0:
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -1304,12 +1495,14 @@ expand-brackets@^2.1.4:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -1317,10 +1510,12 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -1329,6 +1524,7 @@ external-editor@^3.0.0:
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -1342,18 +1538,22 @@ extglob@^2.0.4:
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
 fast-glob@^2.0.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.3.tgz#d09d378e9ef6b0076a0fa1ba7519d9d4d9699c28"
+  integrity sha512-NiX+JXjnx43RzvVFwRWfPKo4U+1BrK5pJPsHQdKMlLoFHrrGktXglQhHliSihWAq+m1z6fHk3uwGHrtRbS9vLA==
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
     "@nodelib/fs.stat" "^1.0.1"
@@ -1365,20 +1565,24 @@ fast-glob@^2.0.2:
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
-figgy-pudding@^3.1.0, figgy-pudding@^3.2.1, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
+figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
   dependencies:
     escape-string-regexp "^1.0.5"
 
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -1388,6 +1592,7 @@ fill-range@^4.0.0:
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
@@ -1395,18 +1600,21 @@ find-up@^1.0.0:
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
     locate-path "^3.0.0"
 
 flush-write-stream@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+  integrity sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
@@ -1414,35 +1622,41 @@ flush-write-stream@^1.0.0:
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "1.0.6"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 from2@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
 fs-extra@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -1451,12 +1665,14 @@ fs-extra@^7.0.0:
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
   dependencies:
     graceful-fs "^4.1.2"
     iferr "^0.1.5"
@@ -1466,10 +1682,12 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -1479,6 +1697,7 @@ fstream@^1.0.0, fstream@^1.0.2:
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -1489,17 +1708,20 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-genfun@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/genfun/-/genfun-4.0.1.tgz#ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1"
+genfun@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
+  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
+  integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0=
   dependencies:
     hosted-git-info "^2.1.4"
     meow "^3.3.0"
@@ -1510,34 +1732,41 @@ get-pkg-repo@^1.0.0:
 get-port@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
+  integrity sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=
 
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stream@^3.0.0:
   version "3.0.0"
-  resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
-get-stream@^4.0.0:
+get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
   dependencies:
     pump "^3.0.0"
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
-git-raw-commits@^2.0.0:
+git-raw-commits@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
+  integrity sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -1548,13 +1777,15 @@ git-raw-commits@^2.0.0:
 git-remote-origin-url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+  integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=
   dependencies:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
 
-git-semver-tags@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.0.tgz#c218fd895bdf8e8e02f6bde555b2c3893ac73cd7"
+git-semver-tags@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.2.tgz#f506ec07caade191ac0c8d5a21bdb8131b4934e3"
+  integrity sha512-34lMF7Yo1xEmsK2EkbArdoU79umpvm0MfzaDkSNYSJqtM5QLAVTPWgpiXSVI5o/O9EvZPSrP4Zvnec/CqhSd5w==
   dependencies:
     meow "^4.0.0"
     semver "^5.5.0"
@@ -1562,12 +1793,14 @@ git-semver-tags@^2.0.0:
 gitconfiglocal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+  integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=
   dependencies:
     ini "^1.3.2"
 
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
@@ -1575,10 +1808,12 @@ glob-parent@^3.1.0:
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -1590,6 +1825,7 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
 globby@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
+  integrity sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==
   dependencies:
     array-union "^1.0.1"
     dir-glob "^2.0.0"
@@ -1600,12 +1836,14 @@ globby@^8.0.1:
     slash "^1.0.0"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
 handlebars@^4.0.2:
   version "4.0.12"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
   dependencies:
     async "^2.5.0"
     optimist "^0.6.1"
@@ -1616,10 +1854,12 @@ handlebars@^4.0.2:
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
   dependencies:
     ajv "^5.3.0"
     har-schema "^2.0.0"
@@ -1627,14 +1867,17 @@ har-validator@~5.1.0:
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -1643,6 +1886,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -1651,10 +1895,12 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -1662,14 +1908,17 @@ has-values@^1.0.0:
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
 http-cache-semantics@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
 
 http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
   dependencies:
     agent-base "4"
     debug "3.1.0"
@@ -1677,6 +1926,7 @@ http-proxy-agent@^2.1.0:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -1685,6 +1935,7 @@ http-signature@~1.2.0:
 https-proxy-agent@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
@@ -1692,32 +1943,46 @@ https-proxy-agent@^2.2.1:
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
   dependencies:
     ms "^2.0.0"
 
 iconv-lite@^0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
   dependencies:
     minimatch "^3.0.4"
 
 ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
+
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
 
 import-local@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  integrity sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==
   dependencies:
     pkg-dir "^2.0.0"
     resolve-cwd "^2.0.0"
@@ -1725,20 +1990,24 @@ import-local@^1.0.0:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
 indent-string@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -1746,14 +2015,17 @@ inflight@^1.0.4:
 inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.2, ini@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
 init-package-json@^1.10.3:
   version "1.10.3"
   resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz#45ffe2f610a8ca134f2bd1db5637b235070f6cbe"
+  integrity sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==
   dependencies:
     glob "^7.1.1"
     npm-package-arg "^4.0.0 || ^5.0.0 || ^6.0.0"
@@ -1767,6 +2039,7 @@ init-package-json@^1.10.3:
 inquirer@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
+  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
@@ -1785,58 +2058,69 @@ inquirer@^6.2.0:
 invert-kv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
 ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
   dependencies:
     builtin-modules "^1.0.0"
 
 is-ci@^1.0.10:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
+  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
   dependencies:
     ci-info "^1.5.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -1845,6 +2129,7 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -1853,124 +2138,150 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
   dependencies:
     is-extglob "^2.1.1"
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
 is-obj@^1.0.0:
   version "1.0.1"
-  resolved "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
 is-text-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+  integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
   dependencies:
     text-extensions "^1.0.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -1978,36 +2289,44 @@ js-yaml@^3.9.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
@@ -2017,32 +2336,38 @@ jsprim@^1.2.2:
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 lcid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
   dependencies:
     invert-kv "^2.0.0"
 
-lerna@^3.2.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.4.1.tgz#4acc5a6b9d843993db7a7bb1350274bcaf20ca80"
+lerna@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.4.3.tgz#501454efb453c65c305802d370ee337f7298787e"
+  integrity sha512-tWq1LvpHqkyB+FaJCmkEweivr88yShDMmauofPVdh0M5gU1cVucszYnIgWafulKYu2LMQ3IfUMUU5Pp3+MvADQ==
   dependencies:
     "@lerna/add" "^3.4.1"
     "@lerna/bootstrap" "^3.4.1"
@@ -2056,7 +2381,7 @@ lerna@^3.2.1:
     "@lerna/init" "^3.3.0"
     "@lerna/link" "^3.3.0"
     "@lerna/list" "^3.3.2"
-    "@lerna/publish" "^3.4.1"
+    "@lerna/publish" "^3.4.3"
     "@lerna/run" "^3.3.2"
     "@lerna/version" "^3.4.1"
     import-local "^1.0.0"
@@ -2065,6 +2390,7 @@ lerna@^3.2.1:
 libnpmaccess@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.0.tgz#33cc9c8a5cb53e87d06bf2e547c2eba974f619af"
+  integrity sha512-SiE4AZAzMpD7pmmXHfgD7rof8QIQGoKaeyAS8exgx2CKA6tzRTbRljq1xM4Tgj8/tIg+KBJPJWkR0ifqKT3irQ==
   dependencies:
     aproba "^2.0.0"
     get-stream "^4.0.0"
@@ -2073,7 +2399,8 @@ libnpmaccess@^3.0.0:
 
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -2084,6 +2411,7 @@ load-json-file@^1.0.0:
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
@@ -2093,6 +2421,7 @@ load-json-file@^4.0.0:
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -2100,6 +2429,7 @@ locate-path@^2.0.0:
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
@@ -2107,14 +2437,17 @@ locate-path@^3.0.0:
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
 lodash.template@^4.0.2:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  integrity sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=
   dependencies:
     lodash._reinterpolate "~3.0.0"
     lodash.templatesettings "^4.0.0"
@@ -2122,16 +2455,19 @@ lodash.template@^4.0.2:
 lodash.templatesettings@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  integrity sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
 lodash@^4.17.10, lodash@^4.17.5, lodash@^4.2.1:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
@@ -2139,6 +2475,7 @@ loud-rejection@^1.0.0:
 lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -2146,12 +2483,14 @@ lru-cache@^4.1.2, lru-cache@^4.1.3:
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   dependencies:
     pify "^3.0.0"
 
 make-fetch-happen@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
+  integrity sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==
   dependencies:
     agentkeepalive "^3.4.1"
     cacache "^11.0.1"
@@ -2168,30 +2507,36 @@ make-fetch-happen@^4.0.1:
 map-age-cleaner@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
+  integrity sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==
   dependencies:
     p-defer "^1.0.0"
 
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+  integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 mem@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
+  integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==
   dependencies:
     map-age-cleaner "^0.1.1"
     mimic-fn "^1.0.0"
@@ -2200,6 +2545,7 @@ mem@^4.0.0:
 meow@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -2215,6 +2561,7 @@ meow@^3.3.0:
 meow@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
+  integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==
   dependencies:
     camelcase-keys "^4.0.0"
     decamelize-keys "^1.0.0"
@@ -2227,12 +2574,14 @@ meow@^4.0.0:
     trim-newlines "^2.0.0"
 
 merge2@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34"
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
+  integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
 
 micromatch@^3.1.10:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -2248,61 +2597,72 @@ micromatch@^3.1.10:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+mime-db@~1.37.0:
+  version "1.37.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
+  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
 
 mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  version "2.1.21"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
   dependencies:
-    mime-db "~1.36.0"
+    mime-db "~1.37.0"
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 minimatch@^3.0.0, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
   dependencies:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
 
 minimist@0.0.8:
   version "0.0.8"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
 minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
+minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
+  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+minizlib@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42"
+  integrity sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==
   dependencies:
     minipass "^2.2.1"
 
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -2318,23 +2678,27 @@ mississippi@^3.0.0:
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
 "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
-  resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
 modify-values@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
+  integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
   dependencies:
     aproba "^1.1.1"
     copy-concurrently "^1.0.0"
@@ -2346,14 +2710,17 @@ move-concurrently@^1.0.1:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+  integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=
   dependencies:
     array-differ "^1.0.0"
     array-union "^1.0.1"
@@ -2363,10 +2730,12 @@ multimatch@^2.1.0:
 mute-stream@0.0.7, mute-stream@~0.0.4:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -2383,10 +2752,12 @@ nanomatch@^1.2.9:
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-fetch-npm@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
+  integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==
   dependencies:
     encoding "^0.1.11"
     json-parse-better-errors "^1.0.0"
@@ -2395,6 +2766,7 @@ node-fetch-npm@^2.0.2:
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
   dependencies:
     fstream "^1.0.0"
     glob "^7.0.3"
@@ -2412,12 +2784,14 @@ node-gyp@^3.8.0:
 "nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -2427,10 +2801,12 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
 npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
 npm-lifecycle@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.0.tgz#1eda2eedb82db929e3a0c50341ab0aad140ed569"
+  integrity sha512-QbBfLlGBKsktwBZLj6AviHC6Q9Y3R/AY4a2PYSIRhSKSS0/CxRyD/PfxEX6tPeOCXQgMSNdwGeECacstgptc+g==
   dependencies:
     byline "^5.0.0"
     graceful-fs "^4.1.11"
@@ -2444,29 +2820,34 @@ npm-lifecycle@^2.0.0:
 "npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
   dependencies:
     hosted-git-info "^2.6.0"
     osenv "^0.1.5"
     semver "^5.5.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^1.1.10:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
+npm-packlist@^1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
+  integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-pick-manifest@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.1.0.tgz#dc381bdd670c35d81655e1d5a94aa3dd4d87fce5"
+npm-pick-manifest@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
+  integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
   dependencies:
+    figgy-pudding "^3.5.1"
     npm-package-arg "^6.0.0"
     semver "^5.4.1"
 
-npm-registry-fetch@^3.0.0, npm-registry-fetch@^3.8.0:
+npm-registry-fetch@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc"
+  integrity sha512-hrw8UMD+Nob3Kl3h8Z/YjmKamb1gf7D1ZZch2otrIXM3uFLB5vjEY6DhMlq80z/zZet6eETLbOXcuQudCB3Zpw==
   dependencies:
     JSONStream "^1.3.4"
     bluebird "^3.5.1"
@@ -2478,12 +2859,14 @@ npm-registry-fetch@^3.0.0, npm-registry-fetch@^3.8.0:
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
 "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -2493,18 +2876,22 @@ npm-run-path@^2.0.0:
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -2513,30 +2900,35 @@ object-copy@^0.1.0:
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
     mimic-fn "^1.0.0"
 
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -2544,10 +2936,12 @@ optimist@^0.6.1:
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
+  integrity sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==
   dependencies:
     execa "^0.10.0"
     lcid "^2.0.0"
@@ -2556,10 +2950,12 @@ os-locale@^3.0.0:
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@0, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -2567,106 +2963,122 @@ osenv@0, osenv@^0.1.5:
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-is-promise@^1.1.0:
   version "1.1.0"
-  resolved "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
 p-limit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+  integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
   dependencies:
     p-try "^2.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
   dependencies:
     p-limit "^2.0.0"
 
 p-map-series@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
+  integrity sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco=
   dependencies:
     p-reduce "^1.0.0"
 
 p-map@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
 p-pipe@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
+  integrity sha1-SxoROZoRUgpneQ7loMHViB1r7+k=
 
 p-reduce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+  integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
 
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
 
 p-waterfall@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-waterfall/-/p-waterfall-1.0.0.tgz#7ed94b3ceb3332782353af6aae11aa9fc235bb00"
+  integrity sha1-ftlLPOszMngjU69qrhGqn8I1uwA=
   dependencies:
     p-reduce "^1.0.0"
 
 pacote@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.0.tgz#59810859bbd72984dcb267269259375d32f391e5"
+  version "9.2.3"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.2.3.tgz#48cfe87beb9177acd6594355a584a538835424b3"
+  integrity sha512-Y3+yY3nBRAxMlZWvr62XLJxOwCmG9UmkGZkFurWHoCjqF0cZL72cTOCRJTvWw8T4OhJS2RTg13x4oYYriauvEw==
   dependencies:
-    bluebird "^3.5.1"
-    cacache "^11.0.2"
-    figgy-pudding "^3.2.1"
-    get-stream "^3.0.0"
-    glob "^7.1.2"
+    bluebird "^3.5.2"
+    cacache "^11.2.0"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.3"
     lru-cache "^4.1.3"
     make-fetch-happen "^4.0.1"
     minimatch "^3.0.4"
-    minipass "^2.3.3"
+    minipass "^2.3.5"
     mississippi "^3.0.0"
     mkdirp "^0.5.1"
     normalize-package-data "^2.4.0"
     npm-package-arg "^6.1.0"
-    npm-packlist "^1.1.10"
-    npm-pick-manifest "^2.1.0"
-    npm-registry-fetch "^3.0.0"
+    npm-packlist "^1.1.12"
+    npm-pick-manifest "^2.2.3"
+    npm-registry-fetch "^3.8.0"
     osenv "^0.1.5"
     promise-inflight "^1.0.1"
     promise-retry "^1.1.1"
-    protoduck "^5.0.0"
+    protoduck "^5.0.1"
     rimraf "^2.6.2"
     safe-buffer "^5.1.2"
-    semver "^5.5.0"
-    ssri "^6.0.0"
-    tar "^4.4.3"
-    unique-filename "^1.1.0"
-    which "^1.3.0"
+    semver "^5.6.0"
+    ssri "^6.0.1"
+    tar "^4.4.6"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
 
 parallel-transform@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
   dependencies:
     cyclist "~0.2.2"
     inherits "^2.0.3"
@@ -2675,16 +3087,19 @@ parallel-transform@^1.1.0:
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
+  integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
 
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -2692,32 +3107,39 @@ parse-json@^4.0.0:
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -2726,52 +3148,63 @@ path-type@^1.0.0:
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
   dependencies:
     find-up "^2.1.0"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise-retry@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
   dependencies:
     err-code "^1.0.0"
     retry "^0.10.0"
@@ -2779,30 +3212,36 @@ promise-retry@^1.1.1:
 promzard@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
+  integrity sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=
   dependencies:
     read "1"
 
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
 
-protoduck@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.0.tgz#752145e6be0ad834cb25716f670a713c860dce70"
+protoduck@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
+  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
   dependencies:
-    genfun "^4.0.1"
+    genfun "^5.0.0"
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
   version "1.1.29"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
+  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
 
 pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -2810,6 +3249,7 @@ pump@^2.0.0:
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -2817,6 +3257,7 @@ pump@^3.0.0:
 pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
     duplexify "^3.6.0"
     inherits "^2.0.3"
@@ -2825,32 +3266,39 @@ pumpify@^1.3.3:
 punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+  integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
 read-cmd-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
+  integrity sha1-LV0Vd4ajfAVdIgd8MsU/gynpHHs=
   dependencies:
     graceful-fs "^4.1.2"
 
 "read-package-json@1 || 2", read-package-json@^2.0.0:
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
   dependencies:
     glob "^7.1.1"
     json-parse-better-errors "^1.0.1"
@@ -2862,6 +3310,7 @@ read-cmd-shim@^1.0.1:
 read-package-tree@^5.1.6:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.1.tgz#6218b187d6fac82289ce4387bbbaf8eef536ad63"
+  integrity sha512-2CNoRoh95LxY47LvqrehIAfUVda2JbuFE/HaGYs42bNrGG+ojbw1h3zOcPcQ+1GQ3+rkzNndZn85u1XyZ3UsIA==
   dependencies:
     debuglog "^1.0.1"
     dezalgo "^1.0.0"
@@ -2872,6 +3321,7 @@ read-package-tree@^5.1.6:
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -2879,13 +3329,15 @@ read-pkg-up@^1.0.1:
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
-read-pkg@^1.0.0, read-pkg@^1.1.0:
+read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -2894,6 +3346,7 @@ read-pkg@^1.0.0, read-pkg@^1.1.0:
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
@@ -2902,12 +3355,14 @@ read-pkg@^3.0.0:
 read@1, read@~1.0.1:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+  integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@~2.3.6:
   version "2.3.6"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -2920,6 +3375,7 @@ read@1, read@~1.0.1:
 readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
   dependencies:
     debuglog "^1.0.1"
     dezalgo "^1.0.0"
@@ -2929,6 +3385,7 @@ readdir-scoped-modules@^1.0.0:
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
@@ -2936,6 +3393,7 @@ redent@^1.0.0:
 redent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
   dependencies:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
@@ -2943,6 +3401,7 @@ redent@^2.0.0:
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
@@ -2950,20 +3409,24 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
 request@^2.87.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -2989,32 +3452,39 @@ request@^2.87.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
   dependencies:
     resolve-from "^3.0.0"
 
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -3022,64 +3492,82 @@ restore-cursor@^2.0.0:
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
 rimraf@2, rimraf@^2.5.4, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
   dependencies:
     is-promise "^2.1.0"
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
   dependencies:
     aproba "^1.1.1"
 
 rxjs@^6.1.0:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
   dependencies:
     tslib "^1.9.0"
 
 safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.4.1, semver@^5.5.0:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+sax@>=0.6.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -3089,6 +3577,7 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -3098,32 +3587,39 @@ set-value@^2.0.0:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 slide@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
 
 smart-buffer@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
+  integrity sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -3132,12 +3628,14 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -3151,13 +3649,15 @@ snapdragon@^0.8.1:
 socks-proxy-agent@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
+  integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
   dependencies:
     agent-base "~4.2.0"
     socks "~2.2.0"
 
 socks@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9"
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.2.tgz#f061219fc2d4d332afb4af93e865c84d3fa26e2b"
+  integrity sha512-g6wjBnnMOZpE0ym6e0uHSddz9p3a+WsBaaYQaBaSCJYvrC4IXykQR9MNGjLQf38e9iIIhp3b1/Zk8YZI3KGJ0Q==
   dependencies:
     ip "^1.1.5"
     smart-buffer "^4.0.1"
@@ -3165,12 +3665,14 @@ socks@~2.2.0:
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
   dependencies:
     is-plain-obj "^1.0.0"
 
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -3181,18 +3683,22 @@ source-map-resolve@^0.5.0:
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 spdx-correct@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.2.tgz#19bb409e91b47b1ad54159243f7312a858db3c2e"
+  integrity sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -3200,64 +3706,73 @@ spdx-correct@^3.0.0:
 spdx-exceptions@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz#a59efc09784c2a5bada13cfeaf5c75dd214044d2"
+  integrity sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 split2@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
+  integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==
   dependencies:
     through2 "^2.0.2"
 
 split@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.2.tgz#c946d6bd9b1a39d0e8635763f5242d6ed6dcb629"
+  integrity sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-    safer-buffer "^2.0.2"
-  optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
     ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
     jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^6.0.0:
+ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
   dependencies:
     figgy-pudding "^3.5.1"
 
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -3265,6 +3780,7 @@ static-extend@^0.1.1:
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
   dependencies:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
@@ -3272,10 +3788,12 @@ stream-each@^1.1.0:
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -3284,6 +3802,7 @@ string-width@^1.0.1:
 "string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
@@ -3291,48 +3810,57 @@ string-width@^1.0.1:
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
-  resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
 strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+  integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
 
 strong-log-transformer@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.0.0.tgz#fa6d8e0a9e62b3c168c3cad5ae5d00dc97ba26cc"
+  integrity sha512-FQmNqAXJgOX8ygOcvPLlGWBNT41mvNJ9ALoYf0GTwVt9t30mGTqpmp/oJx5gLcu52DXK10kS7dVWhx8aPXDTlg==
   dependencies:
     byline "^5.0.0"
     duplexer "^0.1.1"
@@ -3342,25 +3870,28 @@ strong-log-transformer@^2.0.0:
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
 tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
     inherits "2"
 
-tar@^4.4.3:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
+tar@^4.4.6:
+  version "4.4.8"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
+  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
   dependencies:
-    chownr "^1.0.1"
+    chownr "^1.1.1"
     fs-minipass "^1.2.5"
-    minipass "^2.3.3"
-    minizlib "^1.1.0"
+    minipass "^2.3.4"
+    minizlib "^1.1.1"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
@@ -3368,10 +3899,12 @@ tar@^4.4.3:
 temp-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+  integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
 
 temp-write@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492"
+  integrity sha1-jP9jD7fp2gXwR8dM5M5NaFRX1JI=
   dependencies:
     graceful-fs "^4.1.2"
     is-stream "^1.1.0"
@@ -3381,35 +3914,41 @@ temp-write@^3.4.0:
     uuid "^3.0.1"
 
 text-extensions@^1.0.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.8.0.tgz#6f343c62268843019b21a616a003557bdb952d2b"
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
+  integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
 through2@^2.0.0, through2@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
-    readable-stream "^2.1.5"
+    readable-stream "~2.3.6"
     xtend "~4.0.1"
 
 through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
   version "2.3.8"
-  resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -3417,6 +3956,7 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
@@ -3426,6 +3966,7 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
   dependencies:
     psl "^1.1.24"
     punycode "^1.4.1"
@@ -3433,42 +3974,51 @@ tough-cookie@~2.4.3:
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
   dependencies:
     punycode "^2.1.0"
 
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-newlines@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+  integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
 
 trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
+  integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
 tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
@@ -3476,39 +4026,46 @@ uglify-js@^3.1.4:
 uid-number@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+  integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=
 
 umask@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
+  integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
 
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
     set-value "^0.4.3"
 
-unique-filename@^1.1.0:
+unique-filename@^1.1.0, unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
   dependencies:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
+  integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
   dependencies:
     imurmurhash "^0.1.4"
 
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -3516,22 +4073,27 @@ unset-value@^1.0.0:
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 uuid@^3.0.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
 validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -3539,12 +4101,14 @@ validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
   dependencies:
     builtins "^1.0.3"
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -3553,16 +4117,19 @@ verror@1.10.0:
 wcwidth@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
   dependencies:
     defaults "^1.0.3"
 
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
 whatwg-url@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
+  integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^1.0.1"
@@ -3571,26 +4138,31 @@ whatwg-url@^7.0.0:
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.2.9, which@^1.3.0, which@^1.3.1:
+which@1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
-  resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -3598,10 +4170,12 @@ wrap-ansi@^2.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -3610,6 +4184,7 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
 write-json-file@^2.2.0, write-json-file@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
+  integrity sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8=
   dependencies:
     detect-indent "^5.0.0"
     graceful-fs "^4.1.2"
@@ -3621,39 +4196,60 @@ write-json-file@^2.2.0, write-json-file@^2.3.0:
 write-pkg@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.2.0.tgz#0e178fe97820d389a8928bc79535dbe68c2cff21"
+  integrity sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==
   dependencies:
     sort-keys "^2.0.0"
     write-json-file "^2.2.0"
 
+xml2js@^0.4.19:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
+  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~9.0.1"
+
+xmlbuilder@~9.0.1:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
+
 xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
 xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
 
 yargs-parser@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
   dependencies:
     camelcase "^4.1.0"
 
 yargs@^12.0.1:
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
+  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
   dependencies:
     cliui "^4.0.0"
     decamelize "^2.0.0"

From 6f36031fcff5b744404462b3908dd1c29473a2b4 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sat, 10 Nov 2018 14:54:20 +0100
Subject: [PATCH 172/188] fix duplicate loading of plugins

---
 scm-ui/src/containers/Index.js        | 23 ++++++++++++++++++--
 scm-ui/src/containers/PluginLoader.js | 30 +++++++++++++--------------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/scm-ui/src/containers/Index.js b/scm-ui/src/containers/Index.js
index 0fe6364f6e..71bd6b35c2 100644
--- a/scm-ui/src/containers/Index.js
+++ b/scm-ui/src/containers/Index.js
@@ -27,13 +27,32 @@ type Props = {
   t: string => string
 };
 
-class Index extends Component<Props> {
+type State = {
+  pluginsLoaded: boolean
+};
+
+class Index extends Component<Props, State> {
+
+  constructor(props: Props) {
+    super(props);
+    this.state = {
+      pluginsLoaded: false
+    };
+  }
+
   componentDidMount() {
     this.props.fetchIndexResources();
   }
 
+  pluginLoaderCallback = () => {
+    this.setState({
+      pluginsLoaded: true
+    });
+  };
+
   render() {
     const { indexResources, loading, error, t } = this.props;
+    const { pluginsLoaded } = this.state;
 
     if (error) {
       return (
@@ -47,7 +66,7 @@ class Index extends Component<Props> {
       return <Loading />;
     } else {
       return (
-        <PluginLoader>
+        <PluginLoader loaded={ pluginsLoaded } callback={ this.pluginLoaderCallback }>
           <App />
         </PluginLoader>
       );
diff --git a/scm-ui/src/containers/PluginLoader.js b/scm-ui/src/containers/PluginLoader.js
index 8e44a1d427..308f532270 100644
--- a/scm-ui/src/containers/PluginLoader.js
+++ b/scm-ui/src/containers/PluginLoader.js
@@ -5,12 +5,13 @@ import { getUiPluginsLink } from "../modules/indexResource";
 import { connect } from "react-redux";
 
 type Props = {
+  loaded: boolean,
   children: React.Node,
-  link: string
+  link: string,
+  callback: () => void
 };
 
 type State = {
-  finished: boolean,
   message: string
 };
 
@@ -23,17 +24,19 @@ class PluginLoader extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props);
     this.state = {
-      finished: false,
       message: "booting"
     };
   }
 
   componentDidMount() {
-    this.setState({
-      message: "loading plugin information"
-    });
-
-    this.getPlugins(this.props.link);
+    const { loaded } = this.props;
+    if (!loaded) {
+      this.setState({
+        message: "loading plugin information"
+      });
+  
+      this.getPlugins(this.props.link);
+    }
   }
 
   getPlugins = (link: string): Promise<any> => {
@@ -43,11 +46,7 @@ class PluginLoader extends React.Component<Props, State> {
       .then(JSON.parse)
       .then(pluginCollection => pluginCollection._embedded.plugins)
       .then(this.loadPlugins)
-      .then(() => {
-        this.setState({
-          finished: true
-        });
-      });
+      .then(this.props.callback);
   };
 
   loadPlugins = (plugins: Plugin[]) => {
@@ -87,8 +86,9 @@ class PluginLoader extends React.Component<Props, State> {
   };
 
   render() {
-    const { message, finished } = this.state;
-    if (finished) {
+    const { loaded } = this.props;
+    const { message } = this.state;
+    if (loaded) {
       return <div>{this.props.children}</div>;
     }
     return <Loading message={message} />;

From 260f4062078b7e5f022a574a413e130c5d803ddc Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 13 Nov 2018 07:37:49 +0100
Subject: [PATCH 173/188] fix loading spinner on mobile devices

---
 .../packages/ui-components/src/Loading.js     | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/scm-ui-components/packages/ui-components/src/Loading.js b/scm-ui-components/packages/ui-components/src/Loading.js
index 0a472ecb02..6b4817131f 100644
--- a/scm-ui-components/packages/ui-components/src/Loading.js
+++ b/scm-ui-components/packages/ui-components/src/Loading.js
@@ -1,10 +1,14 @@
 //@flow
+
 import React from "react";
 import { translate } from "react-i18next";
 import injectSheet from "react-jss";
 import Image from "./Image";
 
 const styles = {
+  minHeightContainer: {
+    minHeight: "256px"
+  },
   wrapper: {
     position: "relative"
   },
@@ -34,14 +38,16 @@ class Loading extends React.Component<Props> {
   render() {
     const { message, t, classes } = this.props;
     return (
-      <div className={classes.wrapper}>
-        <div className={classes.loading}>
-          <Image
-            className={classes.image}
-            src="/images/loading.svg"
-            alt={t("loading.alt")}
-          />
-          <p className="has-text-centered">{message}</p>
+      <div className={classes.minHeightContainer}>
+        <div className={classes.wrapper}>
+          <div className={classes.loading}>
+            <Image
+              className={classes.image}
+              src="/images/loading.svg"
+              alt={t("loading.alt")}
+            />
+            <p className="has-text-centered">{message}</p>
+          </div>
         </div>
       </div>
     );

From 24de639c1ebf3e1d3493747778ceb70bb0d2cb76 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 13 Nov 2018 07:38:53 +0100
Subject: [PATCH 174/188] remove unnecessary div, to fix spacing of form
 elements

---
 scm-ui/src/repos/components/form/RepositoryForm.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scm-ui/src/repos/components/form/RepositoryForm.js b/scm-ui/src/repos/components/form/RepositoryForm.js
index 54abf8e08d..8f5d932778 100644
--- a/scm-ui/src/repos/components/form/RepositoryForm.js
+++ b/scm-ui/src/repos/components/form/RepositoryForm.js
@@ -124,7 +124,7 @@ class RepositoryForm extends React.Component<Props, State> {
     const { repositoryTypes, t } = this.props;
     const repository = this.state.repository;
     return (
-      <div>
+      <>
         <InputField
           label={t("repository.name")}
           onChange={this.handleNameChange}
@@ -140,7 +140,7 @@ class RepositoryForm extends React.Component<Props, State> {
           options={this.createSelectOptions(repositoryTypes)}
           helpText={t("help.typeHelpText")}
         />
-      </div>
+      </>
     );
   }
 

From e7c95600735e689bf12d7c56e79f81fe70997e13 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 13 Nov 2018 07:39:19 +0100
Subject: [PATCH 175/188] fix bouncing help icons on mobiles devices

---
 .../packages/ui-components/src/Help.js        | 30 +++++-------
 .../packages/ui-components/src/HelpIcon.js    | 14 ++++++
 .../ui-components/src/LabelWithHelpIcon.js    | 46 -------------------
 .../packages/ui-components/src/Tooltip.js     | 26 +++++++++++
 .../ui-components/src/forms/Checkbox.js       | 13 +++---
 .../ui-components/src/forms/InputField.js     |  2 +-
 .../src/forms/LabelWithHelpIcon.js            | 37 +++++++++++++++
 .../ui-components/src/forms/Select.js         |  2 +-
 .../ui-components/src/forms/Textarea.js       |  2 +-
 .../packages/ui-components/src/forms/index.js |  1 +
 .../packages/ui-components/src/index.js       |  5 +-
 11 files changed, 102 insertions(+), 76 deletions(-)
 create mode 100644 scm-ui-components/packages/ui-components/src/HelpIcon.js
 delete mode 100644 scm-ui-components/packages/ui-components/src/LabelWithHelpIcon.js
 create mode 100644 scm-ui-components/packages/ui-components/src/Tooltip.js
 create mode 100644 scm-ui-components/packages/ui-components/src/forms/LabelWithHelpIcon.js

diff --git a/scm-ui-components/packages/ui-components/src/Help.js b/scm-ui-components/packages/ui-components/src/Help.js
index 965d16f145..047f79244f 100644
--- a/scm-ui-components/packages/ui-components/src/Help.js
+++ b/scm-ui-components/packages/ui-components/src/Help.js
@@ -1,39 +1,33 @@
 //@flow
 import React from "react";
 import injectSheet from "react-jss";
-import classNames from "classnames";
+import Tooltip from './Tooltip';
+import HelpIcon from './HelpIcon';
 
 const styles = {
-  img: {
-    display: "block"
-  },
-  q: {
-    float: "left",
-    paddingLeft: "3px",
-    float: "right"
+  tooltip: {
+    display: "inline-block",
+    paddingLeft: "3px"
   }
 };
 
 type Props = {
   message: string,
   classes: any
-};
+}
 
 class Help extends React.Component<Props> {
+
   render() {
     const { message, classes } = this.props;
-    const multiline = message.length > 60 ? "is-tooltip-multiline" : "";
     return (
-      <div
-        className={classNames("tooltip is-tooltip-right", multiline, classes.q)}
-        data-tooltip={message}
-      >
-        <i
-          className={classNames("fa fa-question has-text-info", classes.img)}
-        />
-      </div>
+      <Tooltip className={classes.tooltip} message={message}>
+        <HelpIcon />
+      </Tooltip>
     );
   }
+
 }
 
 export default injectSheet(styles)(Help);
+
diff --git a/scm-ui-components/packages/ui-components/src/HelpIcon.js b/scm-ui-components/packages/ui-components/src/HelpIcon.js
new file mode 100644
index 0000000000..fba8ead422
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/src/HelpIcon.js
@@ -0,0 +1,14 @@
+//@flow
+import React from "react";
+import classNames from "classnames";
+
+type Props = {
+};
+
+class HelpIcon extends React.Component<Props> {
+  render() {
+    return <i className={classNames("fa fa-question has-text-info")} />
+  }
+}
+
+export default HelpIcon;
diff --git a/scm-ui-components/packages/ui-components/src/LabelWithHelpIcon.js b/scm-ui-components/packages/ui-components/src/LabelWithHelpIcon.js
deleted file mode 100644
index b5d049e68d..0000000000
--- a/scm-ui-components/packages/ui-components/src/LabelWithHelpIcon.js
+++ /dev/null
@@ -1,46 +0,0 @@
-//@flow
-import React from "react";
-import { Help } from "./index";
-
-type Props = {
-  label: string,
-  helpText?: string
-};
-
-class LabelWithHelpIcon extends React.Component<Props> {
-  renderLabel = () => {
-    const label = this.props.label;
-    if (label) {
-      return <label className="label">{label}</label>;
-    }
-    return "";
-  };
-
-  renderHelp = () => {
-    const helpText = this.props.helpText;
-    if (helpText) {
-      return (
-        <div className="control columns is-vcentered">
-          <Help message={helpText} />
-        </div>
-      );
-    } else return null;
-  };
-
-  renderLabelWithHelpIcon = () => {
-    if (this.props.label) {
-      return (
-        <div className="field is-grouped">
-          <div className="control">{this.renderLabel()}</div>
-          {this.renderHelp()}
-        </div>
-      );
-    } else return null;
-  };
-
-  render() {
-    return this.renderLabelWithHelpIcon();
-  }
-}
-
-export default LabelWithHelpIcon;
diff --git a/scm-ui-components/packages/ui-components/src/Tooltip.js b/scm-ui-components/packages/ui-components/src/Tooltip.js
new file mode 100644
index 0000000000..d935b323c7
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/src/Tooltip.js
@@ -0,0 +1,26 @@
+//@flow
+import * as React from "react";
+import classNames from "classnames";
+
+type Props = {
+  message: string,
+  className: string,
+  children: React.Node
+};
+
+class Tooltip extends React.Component<Props> {
+  render() {
+    const { className, message, children } = this.props;
+    const multiline = message.length > 60 ? "is-tooltip-multiline" : "";
+    return (
+      <div
+        className={classNames("tooltip", "is-tooltip-right", multiline, className)}
+        data-tooltip={message}
+      >
+        {children}
+      </div>
+    );
+  }
+}
+
+export default Tooltip;
diff --git a/scm-ui-components/packages/ui-components/src/forms/Checkbox.js b/scm-ui-components/packages/ui-components/src/forms/Checkbox.js
index 7db35958d5..93cd28c28f 100644
--- a/scm-ui-components/packages/ui-components/src/forms/Checkbox.js
+++ b/scm-ui-components/packages/ui-components/src/forms/Checkbox.js
@@ -10,7 +10,9 @@ type Props = {
   disabled?: boolean,
   helpText?: string
 };
+
 class Checkbox extends React.Component<Props> {
+
   onCheckboxChange = (event: SyntheticInputEvent<HTMLInputElement>) => {
     if (this.props.onChange) {
       this.props.onChange(event.target.checked, this.props.name);
@@ -20,12 +22,8 @@ class Checkbox extends React.Component<Props> {
   renderHelp = () => {
     const helpText = this.props.helpText;
     if (helpText) {
-      return (
-        <div className="control columns is-vcentered">
-          <Help message={helpText} />
-        </div>
-      );
-    } else return null;
+      return <Help message={helpText} />;
+    }
   };
 
   render() {
@@ -39,10 +37,11 @@ class Checkbox extends React.Component<Props> {
               onChange={this.onCheckboxChange}
               disabled={this.props.disabled}
             />
+            {" "}
             {this.props.label}
+            {this.renderHelp()}
           </label>
         </div>
-        {this.renderHelp()}
       </div>
     );
   }
diff --git a/scm-ui-components/packages/ui-components/src/forms/InputField.js b/scm-ui-components/packages/ui-components/src/forms/InputField.js
index 32c419f6c5..52ff9a369b 100644
--- a/scm-ui-components/packages/ui-components/src/forms/InputField.js
+++ b/scm-ui-components/packages/ui-components/src/forms/InputField.js
@@ -1,7 +1,7 @@
 //@flow
 import React from "react";
 import classNames from "classnames";
-import { LabelWithHelpIcon } from "../index";
+import LabelWithHelpIcon from "./LabelWithHelpIcon";
 
 type Props = {
   label?: string,
diff --git a/scm-ui-components/packages/ui-components/src/forms/LabelWithHelpIcon.js b/scm-ui-components/packages/ui-components/src/forms/LabelWithHelpIcon.js
new file mode 100644
index 0000000000..8a917828ec
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/src/forms/LabelWithHelpIcon.js
@@ -0,0 +1,37 @@
+//@flow
+import React from "react";
+import Help from '../Help';
+
+type Props = {
+  label?: string,
+  helpText?: string
+};
+
+class LabelWithHelpIcon extends React.Component<Props> {
+
+  renderHelp() {
+    const { helpText } = this.props;
+    if (helpText) {
+      return (
+        <Help message={helpText} />
+      );
+    }
+  }
+
+  render() {
+    const {label } = this.props;
+
+    if (label) {
+      const help = this.renderHelp();
+      return (
+        <label className="label">
+          {label} { help }
+        </label>
+      );
+    }
+
+    return "";
+  }
+}
+
+export default LabelWithHelpIcon;
diff --git a/scm-ui-components/packages/ui-components/src/forms/Select.js b/scm-ui-components/packages/ui-components/src/forms/Select.js
index c3956ea8f3..ccb82e62da 100644
--- a/scm-ui-components/packages/ui-components/src/forms/Select.js
+++ b/scm-ui-components/packages/ui-components/src/forms/Select.js
@@ -1,7 +1,7 @@
 //@flow
 import React from "react";
 import classNames from "classnames";
-import { LabelWithHelpIcon } from "../index";
+import LabelWithHelpIcon from "./LabelWithHelpIcon";
 
 export type SelectItem = {
   value: string,
diff --git a/scm-ui-components/packages/ui-components/src/forms/Textarea.js b/scm-ui-components/packages/ui-components/src/forms/Textarea.js
index 5a14b3407a..3db590122a 100644
--- a/scm-ui-components/packages/ui-components/src/forms/Textarea.js
+++ b/scm-ui-components/packages/ui-components/src/forms/Textarea.js
@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import { LabelWithHelpIcon } from "../index";
+import LabelWithHelpIcon from "./LabelWithHelpIcon";
 
 export type SelectItem = {
   value: string,
diff --git a/scm-ui-components/packages/ui-components/src/forms/index.js b/scm-ui-components/packages/ui-components/src/forms/index.js
index 24e52daa1d..c96f3a8196 100644
--- a/scm-ui-components/packages/ui-components/src/forms/index.js
+++ b/scm-ui-components/packages/ui-components/src/forms/index.js
@@ -5,4 +5,5 @@ export { default as Checkbox } from "./Checkbox.js";
 export { default as InputField } from "./InputField.js";
 export { default as Select } from "./Select.js";
 export { default as Textarea } from "./Textarea.js";
+export { default as LabelWithHelpIcon } from "./LabelWithHelpIcon";
 
diff --git a/scm-ui-components/packages/ui-components/src/index.js b/scm-ui-components/packages/ui-components/src/index.js
index 2ebe57ec0c..41e385af8d 100644
--- a/scm-ui-components/packages/ui-components/src/index.js
+++ b/scm-ui-components/packages/ui-components/src/index.js
@@ -17,8 +17,9 @@ export { default as Notification } from "./Notification.js";
 export { default as Paginator } from "./Paginator.js";
 export { default as LinkPaginator } from "./LinkPaginator.js";
 export { default as ProtectedRoute } from "./ProtectedRoute.js";
-export { default as Help } from "./Help.js";
-export { default as LabelWithHelpIcon } from "./LabelWithHelpIcon.js";
+export { default as Help } from "./Help";
+export { default as HelpIcon } from "./HelpIcon";
+export { default as Tooltip } from "./Tooltip";
 export { getPageFromMatch } from "./urls";
 
 export { apiClient, NOT_FOUND_ERROR, UNAUTHORIZED_ERROR } from "./apiclient.js";

From 3e99709035531330eeaf5e494982fdfa97d927d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 13 Nov 2018 09:54:28 +0100
Subject: [PATCH 176/188] Replace method interceptor with request filter

---
 .../main/java/sonia/scm/ScmServletModule.java | 19 ------
 .../scm/security/SecurityInterceptor.java     | 29 ---------
 .../scm/security/SecurityRequestFilter.java   | 46 ++++++++++++++
 .../security/SecurityRequestFilterTest.java   | 62 +++++++++++++++++++
 4 files changed, 108 insertions(+), 48 deletions(-)
 delete mode 100644 scm-webapp/src/main/java/sonia/scm/security/SecurityInterceptor.java
 create mode 100644 scm-webapp/src/main/java/sonia/scm/security/SecurityRequestFilter.java
 create mode 100644 scm-webapp/src/test/java/sonia/scm/security/SecurityRequestFilterTest.java

diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
index 0d324137ce..90764a7e00 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
@@ -45,7 +45,6 @@ import sonia.scm.api.rest.ObjectMapperProvider;
 import sonia.scm.cache.CacheManager;
 import sonia.scm.cache.GuavaCacheManager;
 import sonia.scm.config.ScmConfiguration;
-import sonia.scm.debug.DebugResource;
 import sonia.scm.event.ScmEventBus;
 import sonia.scm.group.DefaultGroupManager;
 import sonia.scm.group.GroupDAO;
@@ -88,7 +87,6 @@ import sonia.scm.security.DefaultKeyGenerator;
 import sonia.scm.security.DefaultSecuritySystem;
 import sonia.scm.security.KeyGenerator;
 import sonia.scm.security.LoginAttemptHandler;
-import sonia.scm.security.SecurityInterceptor;
 import sonia.scm.security.SecuritySystem;
 import sonia.scm.store.BlobStoreFactory;
 import sonia.scm.store.ConfigurationEntryStoreFactory;
@@ -120,16 +118,7 @@ import sonia.scm.web.security.DefaultAdministrationContext;
 
 import javax.net.ssl.SSLContext;
 import javax.servlet.ServletContext;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HEAD;
-import javax.ws.rs.OPTIONS;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
 
-import static com.google.inject.matcher.Matchers.annotatedWith;
-import static com.google.inject.matcher.Matchers.not;
-import static com.google.inject.matcher.Matchers.subclassesOf;
 import static sonia.scm.api.v2.resources.ScmPathInfo.REST_API_PATH;
 
 /**
@@ -330,14 +319,6 @@ public class ScmServletModule extends ServletModule
     // bind(LastModifiedUpdateListener.class);
 
     bind(PushStateDispatcher.class).toProvider(PushStateDispatcherProvider.class);
-    bindInterceptor(not(subclassesOf(DebugResource.class)),
-      annotatedWith(GET.class)
-        .or(annotatedWith(POST.class))
-        .or(annotatedWith(HEAD.class))
-        .or(annotatedWith(PUT.class))
-        .or(annotatedWith(DELETE.class))
-        .or(annotatedWith(OPTIONS.class)),
-      new SecurityInterceptor());
   }
 
 
diff --git a/scm-webapp/src/main/java/sonia/scm/security/SecurityInterceptor.java b/scm-webapp/src/main/java/sonia/scm/security/SecurityInterceptor.java
deleted file mode 100644
index e055590bba..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/security/SecurityInterceptor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package sonia.scm.security;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.subject.Subject;
-
-public class SecurityInterceptor implements MethodInterceptor {
-
-  @Override
-  public Object invoke(MethodInvocation methodInvocation) throws Throwable {
-    if (hasPermission() || anonymousAccessIsAllowed(methodInvocation)) {
-      return methodInvocation.proceed();
-    } else {
-      throw new AuthenticationException();
-    }
-  }
-
-  private boolean anonymousAccessIsAllowed(MethodInvocation methodInvocation) {
-    return methodInvocation.getMethod().isAnnotationPresent(AllowAnonymousAccess.class)
-      || methodInvocation.getMethod().getDeclaringClass().isAnnotationPresent(AllowAnonymousAccess.class);
-  }
-
-  private boolean hasPermission() {
-    Subject subject = SecurityUtils.getSubject();
-    return subject.isAuthenticated() || subject.isRemembered();
-  }
-}
diff --git a/scm-webapp/src/main/java/sonia/scm/security/SecurityRequestFilter.java b/scm-webapp/src/main/java/sonia/scm/security/SecurityRequestFilter.java
new file mode 100644
index 0000000000..6c3723935e
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/security/SecurityRequestFilter.java
@@ -0,0 +1,46 @@
+package sonia.scm.security;
+
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.subject.Subject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.ext.Provider;
+import java.lang.reflect.Method;
+
+@Provider
+public class SecurityRequestFilter  implements ContainerRequestFilter {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SecurityRequestFilter.class);
+
+  @Context
+  private ResourceInfo resourceInfo;
+
+  @Override
+  public void filter(ContainerRequestContext requestContext) {
+    Method resourceMethod = resourceInfo.getResourceMethod();
+    LOG.info("jax-rs method {}", resourceMethod.getName());
+    if (hasPermission() || anonymousAccessIsAllowed(resourceMethod)) {
+      LOG.debug("allowed unauthenticated request to method {}", resourceMethod);
+      // nothing further to do
+    } else {
+      LOG.debug("blocked unauthenticated request to method {}", resourceMethod);
+      throw new AuthenticationException();
+    }
+  }
+
+  private boolean anonymousAccessIsAllowed(Method method) {
+    return method.isAnnotationPresent(AllowAnonymousAccess.class)
+      || method.getDeclaringClass().isAnnotationPresent(AllowAnonymousAccess.class);
+  }
+
+  private boolean hasPermission() {
+    Subject subject = SecurityUtils.getSubject();
+    return subject.isAuthenticated() || subject.isRemembered();
+  }
+}
diff --git a/scm-webapp/src/test/java/sonia/scm/security/SecurityRequestFilterTest.java b/scm-webapp/src/test/java/sonia/scm/security/SecurityRequestFilterTest.java
new file mode 100644
index 0000000000..663198dff2
--- /dev/null
+++ b/scm-webapp/src/test/java/sonia/scm/security/SecurityRequestFilterTest.java
@@ -0,0 +1,62 @@
+package sonia.scm.security;
+
+import com.github.sdorra.shiro.ShiroRule;
+import com.github.sdorra.shiro.SubjectAware;
+import org.apache.shiro.authc.AuthenticationException;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ResourceInfo;
+
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+@SubjectAware(configuration = "classpath:sonia/scm/shiro-001.ini")
+public class SecurityRequestFilterTest {
+
+  @Rule
+  public ShiroRule shiroRule = new ShiroRule();
+
+  @Mock
+  private ResourceInfo resourceInfo;
+  @Mock
+  private ContainerRequestContext context;
+  @InjectMocks
+  private SecurityRequestFilter securityRequestFilter;
+
+  @Test
+  public void shouldAllowUnauthenticatedAccessForAnnotatedMethod() throws NoSuchMethodException {
+    when(resourceInfo.getResourceMethod()).thenReturn(SecurityTestClass.class.getMethod("anonymousAccessAllowed"));
+
+    securityRequestFilter.filter(context);
+  }
+
+  @Test(expected = AuthenticationException.class)
+  public void shouldRejectUnauthenticatedAccessForAnnotatedMethod() throws NoSuchMethodException {
+    when(resourceInfo.getResourceMethod()).thenReturn(SecurityTestClass.class.getMethod("loginRequired"));
+
+    securityRequestFilter.filter(context);
+  }
+
+  @Test
+  @SubjectAware(username = "trillian", password = "secret")
+  public void shouldAllowAuthenticatedAccessForMethodWithoutAnnotation() throws NoSuchMethodException {
+    when(resourceInfo.getResourceMethod()).thenReturn(SecurityTestClass.class.getMethod("loginRequired"));
+
+    securityRequestFilter.filter(context);
+  }
+
+  private static class SecurityTestClass {
+    @AllowAnonymousAccess
+    public void anonymousAccessAllowed() {
+    }
+
+    public void loginRequired() {
+    }
+  }
+}

From d68b07c255381b5d54ef5c68c5732737fd1eb86e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@web.de>
Date: Tue, 13 Nov 2018 10:03:08 +0100
Subject: [PATCH 177/188] Close branch bugfix/duplicate_loading_of_plugins


From de17902fed66d7da60b013d35bcfb70ea57b5f4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 13 Nov 2018 10:52:42 +0100
Subject: [PATCH 178/188] Rename classes

---
 .../scm/web/filter/AuthenticationFilter.java  |  2 +-
 ...pagatePrincipleServletRequestWrapper.java} | 30 ++++---------------
 ...ter.java => PropagatePrincipleFilter.java} | 10 +++----
 ...java => PropagatePrincipleFilterTest.java} | 18 +++++------
 4 files changed, 19 insertions(+), 41 deletions(-)
 rename scm-core/src/main/java/sonia/scm/web/filter/{SecurityHttpServletRequestWrapper.java => PropagatePrincipleServletRequestWrapper.java} (78%)
 rename scm-webapp/src/main/java/sonia/scm/filter/{SecurityFilter.java => PropagatePrincipleFilter.java} (91%)
 rename scm-webapp/src/test/java/sonia/scm/filter/{SecurityFilterTest.java => PropagatePrincipleFilterTest.java} (88%)

diff --git a/scm-core/src/main/java/sonia/scm/web/filter/AuthenticationFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/AuthenticationFilter.java
index b88dda8a97..ffe6ecc787 100644
--- a/scm-core/src/main/java/sonia/scm/web/filter/AuthenticationFilter.java
+++ b/scm-core/src/main/java/sonia/scm/web/filter/AuthenticationFilter.java
@@ -301,7 +301,7 @@ public class AuthenticationFilter extends HttpFilter
       }
     }
 
-    chain.doFilter(new SecurityHttpServletRequestWrapper(request, username),
+    chain.doFilter(new PropagatePrincipleServletRequestWrapper(request, username),
       response);
   }
 
diff --git a/scm-core/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java b/scm-core/src/main/java/sonia/scm/web/filter/PropagatePrincipleServletRequestWrapper.java
similarity index 78%
rename from scm-core/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java
rename to scm-core/src/main/java/sonia/scm/web/filter/PropagatePrincipleServletRequestWrapper.java
index 2cd78ce807..2b40b0e73f 100644
--- a/scm-core/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java
+++ b/scm-core/src/main/java/sonia/scm/web/filter/PropagatePrincipleServletRequestWrapper.java
@@ -38,37 +38,17 @@ package sonia.scm.web.filter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 
-/**
- *
- * @author Sebastian Sdorra
- */
-public class SecurityHttpServletRequestWrapper extends HttpServletRequestWrapper
-{
+public class PropagatePrincipleServletRequestWrapper extends HttpServletRequestWrapper {
 
- /**
-   * Constructs ...
-   *
-   *
-   * @param request
-   * @param principal
-   */
-  public SecurityHttpServletRequestWrapper(HttpServletRequest request,
-    String principal)
-  {
+  private final String principal;
+
+  public PropagatePrincipleServletRequestWrapper(HttpServletRequest request, String principal) {
     super(request);
     this.principal = principal;
   }
 
-  //~--- get methods ----------------------------------------------------------
-
   @Override
-  public String getRemoteUser()
-  {
+  public String getRemoteUser() {
     return principal;
   }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private final String principal;
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/PropagatePrincipleFilter.java
similarity index 91%
rename from scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java
rename to scm-webapp/src/main/java/sonia/scm/filter/PropagatePrincipleFilter.java
index ea647a4b04..d3ad4cb374 100644
--- a/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/filter/PropagatePrincipleFilter.java
@@ -42,9 +42,8 @@ import org.apache.shiro.subject.Subject;
 import sonia.scm.Priority;
 import sonia.scm.SCMContext;
 import sonia.scm.config.ScmConfiguration;
-import sonia.scm.security.SecurityRequests;
 import sonia.scm.web.filter.HttpFilter;
-import sonia.scm.web.filter.SecurityHttpServletRequestWrapper;
+import sonia.scm.web.filter.PropagatePrincipleServletRequestWrapper;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
@@ -61,9 +60,8 @@ import static sonia.scm.api.v2.resources.ScmPathInfo.REST_API_PATH;
  * @author Sebastian Sdorra
  */
 @Priority(Filters.PRIORITY_AUTHORIZATION)
-// TODO find a better way for unprotected resources
 @WebElement(value = REST_API_PATH + "/(?!v2/ui).*", regex = true)
-public class SecurityFilter extends HttpFilter
+public class PropagatePrincipleFilter extends HttpFilter
 {
 
   /** name of request attribute for the primary principal */
@@ -73,7 +71,7 @@ public class SecurityFilter extends HttpFilter
   private final ScmConfiguration configuration;
 
   @Inject
-  public SecurityFilter(ScmConfiguration configuration)
+  public PropagatePrincipleFilter(ScmConfiguration configuration)
   {
     this.configuration = configuration;
   }
@@ -92,7 +90,7 @@ public class SecurityFilter extends HttpFilter
       request.setAttribute(ATTRIBUTE_REMOTE_USER, username);
 
       // wrap servlet request to provide authentication information
-      chain.doFilter(new SecurityHttpServletRequestWrapper(request, username), response);
+      chain.doFilter(new PropagatePrincipleServletRequestWrapper(request, username), response);
     }
     else
     {
diff --git a/scm-webapp/src/test/java/sonia/scm/filter/SecurityFilterTest.java b/scm-webapp/src/test/java/sonia/scm/filter/PropagatePrincipleFilterTest.java
similarity index 88%
rename from scm-webapp/src/test/java/sonia/scm/filter/SecurityFilterTest.java
rename to scm-webapp/src/test/java/sonia/scm/filter/PropagatePrincipleFilterTest.java
index 6badc0b7b0..0f2146beab 100644
--- a/scm-webapp/src/test/java/sonia/scm/filter/SecurityFilterTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/filter/PropagatePrincipleFilterTest.java
@@ -58,13 +58,13 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.verify;
 
 /**
- * Unit tests for {@link SecurityFilter}.
+ * Unit tests for {@link PropagatePrincipleFilter}.
  * 
  * @author Sebastian Sdorra
  */
 @RunWith(MockitoJUnitRunner.class)
 @SubjectAware(configuration = "classpath:sonia/scm/shiro-001.ini")
-public class SecurityFilterTest {
+public class PropagatePrincipleFilterTest {
 
   @Mock
   private HttpServletRequest request;
@@ -83,7 +83,7 @@ public class SecurityFilterTest {
 
   private ScmConfiguration configuration;
   
-  private SecurityFilter securityFilter;
+  private PropagatePrincipleFilter propagatePrincipleFilter;
   
   @Rule
   public ShiroRule shiro = new ShiroRule();
@@ -94,7 +94,7 @@ public class SecurityFilterTest {
   @Before
   public void setUp(){
     this.configuration = new ScmConfiguration();
-    this.securityFilter = new SecurityFilter(configuration);
+    this.propagatePrincipleFilter = new PropagatePrincipleFilter(configuration);
   }
   
   /**
@@ -105,7 +105,7 @@ public class SecurityFilterTest {
    */
   @Test
   public void testAnonymous() throws IOException, ServletException {
-    securityFilter.doFilter(request, response, chain);
+    propagatePrincipleFilter.doFilter(request, response, chain);
     response.sendError(HttpServletResponse.SC_FORBIDDEN);
   }
   
@@ -120,10 +120,10 @@ public class SecurityFilterTest {
     configuration.setAnonymousAccessEnabled(true);
     
     // execute
-    securityFilter.doFilter(request, response, chain);
+    propagatePrincipleFilter.doFilter(request, response, chain);
     
     // verify and capture
-    verify(request).setAttribute(SecurityFilter.ATTRIBUTE_REMOTE_USER, SCMContext.USER_ANONYMOUS);
+    verify(request).setAttribute(PropagatePrincipleFilter.ATTRIBUTE_REMOTE_USER, SCMContext.USER_ANONYMOUS);
     verify(chain).doFilter(requestCaptor.capture(), responseCaptor.capture());
     
     // assert
@@ -142,10 +142,10 @@ public class SecurityFilterTest {
     authenticateUser(UserTestData.createTrillian());
 
     // execute
-    securityFilter.doFilter(request, response, chain);
+    propagatePrincipleFilter.doFilter(request, response, chain);
     
     // verify and capture
-    verify(request).setAttribute(SecurityFilter.ATTRIBUTE_REMOTE_USER, "trillian");
+    verify(request).setAttribute(PropagatePrincipleFilter.ATTRIBUTE_REMOTE_USER, "trillian");
     verify(chain).doFilter(requestCaptor.capture(), responseCaptor.capture());
     
     // assert

From 541303b351fd77561d24c8e2fe3fd61c5ff2771d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 13 Nov 2018 11:12:16 +0100
Subject: [PATCH 179/188] Move annotation to corresponding module

---
 .../src/main/java/sonia/scm/security/AllowAnonymousAccess.java    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {scm-webapp => scm-annotations}/src/main/java/sonia/scm/security/AllowAnonymousAccess.java (100%)

diff --git a/scm-webapp/src/main/java/sonia/scm/security/AllowAnonymousAccess.java b/scm-annotations/src/main/java/sonia/scm/security/AllowAnonymousAccess.java
similarity index 100%
rename from scm-webapp/src/main/java/sonia/scm/security/AllowAnonymousAccess.java
rename to scm-annotations/src/main/java/sonia/scm/security/AllowAnonymousAccess.java

From c173db35a26c901782dc930ea9e88b3b99806987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 13 Nov 2018 11:14:41 +0100
Subject: [PATCH 180/188] Add documentation

---
 .../main/java/sonia/scm/security/AllowAnonymousAccess.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scm-annotations/src/main/java/sonia/scm/security/AllowAnonymousAccess.java b/scm-annotations/src/main/java/sonia/scm/security/AllowAnonymousAccess.java
index 86d9bf92ad..b770914d69 100644
--- a/scm-annotations/src/main/java/sonia/scm/security/AllowAnonymousAccess.java
+++ b/scm-annotations/src/main/java/sonia/scm/security/AllowAnonymousAccess.java
@@ -5,6 +5,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+/**
+ * Use this annotation to mark REST resource methods that may be accessed <b>without</b> authentication.
+ * To mark all methods of a complete class you can annotate the class instead.
+ */
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AllowAnonymousAccess {

From c50e78815bbf9a08b03b88fe70d96d8b7f49e5b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 13 Nov 2018 11:22:19 +0100
Subject: [PATCH 181/188] Remove unnecessary regex

---
 .../src/main/java/sonia/scm/filter/PropagatePrincipleFilter.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/filter/PropagatePrincipleFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/PropagatePrincipleFilter.java
index d3ad4cb374..508e804d1f 100644
--- a/scm-webapp/src/main/java/sonia/scm/filter/PropagatePrincipleFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/filter/PropagatePrincipleFilter.java
@@ -60,7 +60,6 @@ import static sonia.scm.api.v2.resources.ScmPathInfo.REST_API_PATH;
  * @author Sebastian Sdorra
  */
 @Priority(Filters.PRIORITY_AUTHORIZATION)
-@WebElement(value = REST_API_PATH + "/(?!v2/ui).*", regex = true)
 public class PropagatePrincipleFilter extends HttpFilter
 {
 

From bee72ac74f9c2961c42f10b11446a3e93fef1038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 13 Nov 2018 11:27:36 +0100
Subject: [PATCH 182/188] Remove outdated selenium test cases

---
 .../scm/selenium/AuthenticationITCase.java    |  60 -------
 .../scm/selenium/RepositoriesITCase.java      |  88 ---------
 .../scm/selenium/SeleniumITCaseBase.java      |  71 --------
 .../sonia/scm/selenium/page/BasePage.java     | 168 ------------------
 .../sonia/scm/selenium/page/LoginPage.java    |  89 ----------
 .../sonia/scm/selenium/page/MainPage.java     |  95 ----------
 .../java/sonia/scm/selenium/page/Pages.java   | 113 ------------
 .../selenium/page/RepositoriesAddPage.java    | 137 --------------
 .../scm/selenium/page/RepositoriesPage.java   | 103 -----------
 .../scm/selenium/page/RepositoryPage.java     |  77 --------
 10 files changed, 1001 deletions(-)
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/selenium/AuthenticationITCase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/selenium/RepositoriesITCase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/selenium/SeleniumITCaseBase.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/selenium/page/BasePage.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/selenium/page/LoginPage.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/selenium/page/MainPage.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/selenium/page/Pages.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoriesAddPage.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoriesPage.java
 delete mode 100644 scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoryPage.java

diff --git a/scm-webapp/src/test/java/sonia/scm/selenium/AuthenticationITCase.java b/scm-webapp/src/test/java/sonia/scm/selenium/AuthenticationITCase.java
deleted file mode 100644
index 34013e7e76..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/selenium/AuthenticationITCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-package sonia.scm.selenium;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import sonia.scm.selenium.page.Pages;
-import sonia.scm.selenium.page.MainPage;
-import sonia.scm.selenium.page.LoginPage;
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-/**
- * Authentication related selenium integration tests.
- * 
- * @author Sebastian Sdorra
- */
-public class AuthenticationITCase extends SeleniumITCaseBase {
-
-  /**
-   * Authenticates an user and call logout function.
-   */
-  @Test
-  public void testAuthentication() {
-    MainPage main = Pages.get(driver, LoginPage.class).login("scmadmin", "scmadmin");
-    assertEquals("scmadmin", main.getUserInfo());
-    main.logout();
-  }
-  
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/selenium/RepositoriesITCase.java b/scm-webapp/src/test/java/sonia/scm/selenium/RepositoriesITCase.java
deleted file mode 100644
index 05898f6529..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/selenium/RepositoriesITCase.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-package sonia.scm.selenium;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import sonia.scm.selenium.page.Pages;
-import sonia.scm.selenium.page.MainPage;
-import sonia.scm.selenium.page.LoginPage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import sonia.scm.repository.Repository;
-
-/**
- * Repository related selenium integration tests.
- * 
- * @author Sebastian Sdorra
- */
-public class RepositoriesITCase extends SeleniumITCaseBase {
-
-  private MainPage main;
-  
-  /**
-   * Authenticates admin user, before each test.
-   */
-  @Before
-  public void login() {
-    main = Pages.get(driver, LoginPage.class)
-                .login("scmadmin", "scmadmin");
-  }
-
-  /**
-   * Creates, select and removes a repository. 
-   */
-  @Test
-  public void createRepository() {
-    Repository repository = new Repository();
-    repository.setName("scm");
-    repository.setType("git");
-    repository.setContact("scmadmin@scm-manager.org");
-    repository.setDescription("SCM-Manager");
-    
-    main.repositories()
-        .add(repository)
-        .select(repository.getName())
-        .remove();
-  }
-  
-  /**
-   * Logs the user out, after each test.
-   */
-  @After
-  public void logout() {
-    main.logout();
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/selenium/SeleniumITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/selenium/SeleniumITCaseBase.java
deleted file mode 100644
index fde04d9cad..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/selenium/SeleniumITCaseBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright (c) 2014, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-package sonia.scm.selenium;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.firefox.FirefoxDriver;
-
-/**
- * Base class for selenium integration tests.
- *
- * @author Sebastian Sdorra
- */
-public class SeleniumITCaseBase {
-  
-  /**
-   * Selenium test driver.
-   */
-  protected static WebDriver driver;
-  
-  /**
-   * Setup selenium test driver.
-   */
-  @BeforeClass
-  public static void setUpDriver() {
-    // DesiredCapabilities capa = DesiredCapabilities.chrome();
-    // capa.setBrowserName("firefox");
-    // capa.setPlatform(Platform.ANY);
-    // RemoteWebDriver driver = new RemoteWebDriver(new URL("http://localhost:4444/wd/hub"), capa);
-    
-    driver = new FirefoxDriver();
-    driver.get("http://localhost:8082/scm/index.html");
-  }
-
-  /**
-   * Closes the selenium test driver.
-   */  
-  @AfterClass
-  public static void tearDownDriver() {
-    driver.close();
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/selenium/page/BasePage.java b/scm-webapp/src/test/java/sonia/scm/selenium/page/BasePage.java
deleted file mode 100644
index 28c27457a8..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/selenium/page/BasePage.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Copyright (c) 2014, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-package sonia.scm.selenium.page;
-
-import com.google.common.base.Throwables;
-import com.google.common.io.Files;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import org.openqa.selenium.By;
-import org.openqa.selenium.OutputType;
-import org.openqa.selenium.TakesScreenshot;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
-
-/**
- * Abstract selenium base page.
- *
- * @author Sebastian Sdorra
- * 
- * @param <P> concrete page implementation
- */
-public abstract class BasePage<P extends BasePage> {
-  
-  /**
-   * Selenium test driver.
-   */
-  protected final WebDriver driver;
-
-  /**
-   * Constructs a new base page.
-   * 
-   * @param driver selenium test driver
-   */
-  protected BasePage(WebDriver driver) {
-    this.driver = driver;
-  }
-  
-  /**
-   * Performs a {@link Thread#sleep(long)} for the given timeout.
-   * 
-   * @param time timeout
-   * @param unit time unit of timeout
-   */
-  protected void sleep(long time, TimeUnit unit) {
-    try {
-      unit.sleep(time);
-    } catch (InterruptedException ex) {
-      throw Throwables.propagate(ex);
-    }
-  }
-  
-  /**
-   * Wait for the element until it is clickable.
-   * 
-   * @param by element selector
-   * 
-   * @return web element
-   */
-  protected WebElement waitToBeClickable(By by){
-    return waitToBeClickable(driver.findElement(by));
-  }
-  
-  /**
-   * Waits for the element until it is clickable.
-   * 
-   * @param element web element
-   * 
-   * @return web element
-   */
-  protected WebElement waitToBeClickable(WebElement element) {
-    WebDriverWait wait = new WebDriverWait(driver, 5);
-
-    return wait.until(ExpectedConditions.elementToBeClickable(element));
-  }
-  
-  /**
-   * Waits until the element is present.
-   * 
-   * @param by element locator
-   * 
-   * @return web element
-   */
-  protected WebElement waitFor(By by){
-    WebDriverWait wait = new WebDriverWait(driver, 1);
-    return wait.until(ExpectedConditions.presenceOfElementLocated(by));
-  }
-  
-  /**
-   * Waits until the elements are present.
-   * 
-   * @param by element selector
-   * 
-   * @return list of web elements
-   */
-  protected List<WebElement> waitForAll(By by){
-    WebDriverWait wait = new WebDriverWait(driver, 1);
-    return wait.until(ExpectedConditions.presenceOfAllElementsLocatedBy(by));
-  }
-  
-  /**
-   * Creates a screenshot of the current browser content and stores it at the given path.
-   * 
-   * @param target target file path
-   * 
-   * @return {@code this}
-   */
-  public P screenshot(String target) {
-    return screenshot(new File(target));
-  }
-
-  /**
-   * Creates a screenshot of the current browser content and stores it at the file.
-   * 
-   * @param target target file
-   * 
-   * @return {@code this}
-   */
-  public P screenshot(File target) {
-    try {
-      File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE);
-
-      Files.copy(scrFile, target);
-    } catch (IOException ex) {
-      throw Throwables.propagate(ex);
-    }
-    return self();
-  }
-  
-  /**
-   * Returns {@code this}.
-   * 
-   * @return {@code this}
-   */
-  protected abstract P self();
-
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/selenium/page/LoginPage.java b/scm-webapp/src/test/java/sonia/scm/selenium/page/LoginPage.java
deleted file mode 100644
index cf9d231510..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/selenium/page/LoginPage.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Copyright (c) 2014, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-package sonia.scm.selenium.page;
-
-import java.util.concurrent.TimeUnit;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-
-/**
- * Page object for the scm-manager login page.
- *
- * @author Sebastian Sdorra
- */
-public class LoginPage extends BasePage<LoginPage> {
-  
-  @FindBy(css = "input[name=username]")
-  private WebElement usernameInput;
-  
-  @FindBy(css = "input[name=password]")
-  private WebElement passwordInput;
-  
-  @FindBy(css = "#loginButton button")
-  private WebElement loginButton;
-
-  /**
-   * Constructs a new page. This constructor should only be called from {@link Pages}.
-   * 
-   * @param driver selenium test driver
-   */
-  LoginPage(WebDriver driver) {
-    super(driver);
-  }
-
-  @Override
-  protected LoginPage self() {
-    return this;
-  }
-  
-  /**
-   * Authenticates the user and returns the {@link MainPage}.
-   * 
-   * @param username username
-   * @param password password
-   * 
-   * @return {@link MainPage} after successful authentication
-   */
-  public MainPage login(String username, String password) {
-    usernameInput.clear();
-    usernameInput.sendKeys(username);
-    
-    passwordInput.clear();
-    passwordInput.sendKeys(password);
-    
-    sleep(250, TimeUnit.MILLISECONDS);
-    
-    waitToBeClickable(loginButton).click();
-    
-    return Pages.get(driver, MainPage.class);
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/selenium/page/MainPage.java b/scm-webapp/src/test/java/sonia/scm/selenium/page/MainPage.java
deleted file mode 100644
index 42fc807e67..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/selenium/page/MainPage.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Copyright (c) 2014, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-package sonia.scm.selenium.page;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-
-/**
- * Page object for scm-manager's main page.
- * 
- * @author Sebastian Sdorra
- */
-public class MainPage extends BasePage<MainPage> {
-  
-  @FindBy(css = "#navLogout a")
-  private WebElement logoutLink;
-
-  @FindBy(linkText = "Repositories")
-  private WebElement repositoriesLink;
-  
-  @FindBy(css = "#scm-userinfo-tip")
-  private WebElement userInfoTip;
-  
-  /**
-   * Constructs a new page. This constructor should only be called from {@link Pages}.
-   * 
-   * @param driver selenium test driver
-   */
-  MainPage(WebDriver driver) {
-    super(driver);
-  }
-  
-  @Override
-  protected MainPage self() {
-    return this;
-  }
-  
-  /**
-   * Returns the name of the current authenticated user from the user info tip.
-   * 
-   * @return name of the current authenticated user
-   */
-  public String getUserInfo(){
-    return userInfoTip.getText();
-  }
-  
-  /**
-   * Navigates to the repositories page and returns the page object for this page.
-   * 
-   * @return page object for repositories page
-   */
-  public RepositoriesPage repositories(){
-    repositoriesLink.click();
-    return Pages.get(driver, RepositoriesPage.class);
-  }
-  
-  /**
-   * Logs the current user out.
-   * 
-   * @return page object for the login
-   */
-  public LoginPage logout(){
-    waitToBeClickable(logoutLink).click();
-    return Pages.get(driver, LoginPage.class);
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/selenium/page/Pages.java b/scm-webapp/src/test/java/sonia/scm/selenium/page/Pages.java
deleted file mode 100644
index b8d85ea08b..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/selenium/page/Pages.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Copyright (c) 2014, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-package sonia.scm.selenium.page;
-
-import com.google.common.base.Throwables;
-import com.google.common.collect.Lists;
-import java.lang.reflect.Constructor;
-import java.util.Arrays;
-import java.util.List;
-import org.openqa.selenium.By;
-import org.openqa.selenium.SearchContext;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
-
-/**
- * Helper class for selenium page objects.
- * 
- * @author Sebastian Sdorra
- */
-public final class Pages {
-  
-  private Pages() {
-  }
-  
-  /**
-   * Creates an instance of the given page object.
-   * 
-   * @param <T> page object type
-   * @param driver selenium driver
-   * @param clazz page object type
-   * @param otherArguments other constructor arguments
-   * 
-   * @return instance of page object
-   */
-  public static <T extends BasePage> T get(WebDriver driver, Class<T> clazz, Object... otherArguments)
-  {
-    T page = null;
-    try {
-      List<Class<?>> argumentTypes = Lists.newArrayList();
-      argumentTypes.add(WebDriver.class);
-      for (Object argument : otherArguments) {
-        argumentTypes.add(argument.getClass());
-      }
-      
-      List<Object> arguments = Lists.newArrayList();
-      arguments.add(driver);
-      arguments.addAll(Arrays.asList(otherArguments));
-      
-      Constructor<T> constructor = clazz.getDeclaredConstructor(
-        argumentTypes.toArray(new Class<?>[argumentTypes.size()])
-      );
-      page = constructor.newInstance(arguments.toArray(new Object[arguments.size()]));
-      
-      PageFactory.initElements(new DefaultElementLocatorFactory(new WaitingSearchContext(driver)), page);
-    } catch (Exception ex) {
-      throw Throwables.propagate(ex);
-    }
-    return page;
-  }
-  
-  private static class WaitingSearchContext implements SearchContext {
-
-    private final WebDriver driver;
-    private final WebDriverWait wait;
-
-    private WaitingSearchContext(WebDriver driver) {
-      this.driver = driver;
-      this.wait = new WebDriverWait(driver, 1);
-    }
-    
-    @Override
-    public List<WebElement> findElements(By by) {
-      return wait.until(ExpectedConditions.presenceOfAllElementsLocatedBy(by));
-    }
-
-    @Override
-    public WebElement findElement(By by) {
-      return wait.until(ExpectedConditions.presenceOfElementLocated(by));
-    }
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoriesAddPage.java b/scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoriesAddPage.java
deleted file mode 100644
index a6b6798b7f..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoriesAddPage.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Copyright (c) 2014, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-package sonia.scm.selenium.page;
-
-import com.google.common.base.MoreObjects;
-import org.openqa.selenium.By;
-import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.NotFoundException;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.ui.WebDriverWait;
-import sonia.scm.repository.Repository;
-
-import java.util.List;
-
-/**
- * Page object for scm-manager's repository creation page.
- *
- * @author Sebastian Sdorra
- */
-public class RepositoriesAddPage extends BasePage<RepositoriesAddPage> {
-  
-  @FindBy(css = "input[name=name]")
-  private WebElement nameInput;
-  
-  @FindBy(css = "input[name=contact]")
-  private WebElement contactInput;
-  
-  @FindBy(css = "#x-form-el-repositoryType img")
-  private WebElement typeInput;
-  
-  @FindBy(css = "textarea[name=description]")
-  private WebElement descriptionInput;
-  
-  @FindBy(css = "div.x-panel-btns button:nth-of-type(1)")
-  private WebElement okButton;
-  
-  private final RepositoriesPage repositoriesPage;
-  
-  /**
-   * Constructs a new page. This constructor should only be called from {@link Pages}.
-   * 
-   * @param driver selenium test driver
-   * @param repositoriesPage repositories page object
-   */
-  RepositoriesAddPage(WebDriver driver, RepositoriesPage repositoriesPage) {
-    super(driver);
-    this.repositoriesPage = repositoriesPage;
-  }
-  
-  @Override
-  protected RepositoriesAddPage self() {
-    return this;
-  }
-  
-  /**
-   * Creates a new {@link Repository}.
-   * 
-   * @param repository repository for creation
-   * 
-   * @return repositories overview page
-   */
-  public RepositoriesPage add(Repository repository) {
-    nameInput.sendKeys(repository.getName());
-    
-    selectType(repository.getType());
-    
-    contactInput.sendKeys(repository.getContact());
-    descriptionInput.sendKeys(repository.getDescription());
-    
-    waitToBeClickable(okButton).click();
-    
-    return repositoriesPage;
-  }
-    
-  private void selectType(String type) {
-    typeInput.click();
-    
-    String displayName = findDisplayName(type);
-    
-    WebDriverWait wait = new WebDriverWait(driver, 1);
-    List<WebElement> elements = waitForAll(By.className("x-combo-list-item"));
-    WebElement typeElement = null;
-    for (WebElement te : elements){
-      if (te.getText().trim().equalsIgnoreCase(displayName)){
-        typeElement = te;
-        break;
-      }
-    }
-    
-    if (typeElement == null){
-      throw new NotFoundException("could not find type element with type " + displayName);
-    }
-    
-    typeElement.click();
-  }
-  
-  private String findDisplayName(String type) {
-    String displayName = null; 
-    if (driver instanceof JavascriptExecutor) {
-      // TODO seams not to work
-      String script = "Sonia.repository.getTypeByName('" + type + "').displayName;";
-      displayName = (String) ((JavascriptExecutor)driver).executeScript(script);
-    }    
-    return MoreObjects.firstNonNull(displayName, type);
-  }
-  
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoriesPage.java b/scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoriesPage.java
deleted file mode 100644
index fef75683ff..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoriesPage.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2014, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-package sonia.scm.selenium.page;
-
-import java.util.List;
-import java.util.Locale;
-import org.openqa.selenium.By;
-import org.openqa.selenium.NotFoundException;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import sonia.scm.repository.Repository;
-
-/**
- * Page object for scm-manager's repositories overview page.
- *
- * @author Sebastian Sdorra
- */
-public class RepositoriesPage extends BasePage<RepositoriesPage> {
-  
-  @FindBy(id = "repositoryAddButton")
-  private WebElement addButton;
-  
-  /**
-   * Constructs a new page. This constructor should only be called from {@link Pages}.
-   * 
-   * @param driver selenium test driver
-   */
-  RepositoriesPage(WebDriver driver) {
-    super(driver);
-  }
-  
-  @Override
-  protected RepositoriesPage self() {
-    return this;
-  }
-
-  /**
-   * Creates a new {@link Repository}.
-   * 
-   * @param repository repository for creation
-   * 
-   * @return {@link this}
-   */  
-  public RepositoriesPage add(Repository repository){
-    addButton.click();
-    RepositoriesAddPage addPage = Pages.get(driver, RepositoriesAddPage.class, this);
-    return addPage.add(repository);
-  }
-  
-  /**
-   * Selects the repository with the given name and returns the detail page object for the selected repository.
-   * 
-   * @param repositoryName name of the repository
-   * 
-   * @return page object for selected repository
-   */
-  public RepositoryPage select(String repositoryName){
-    WebElement repositoryNameColumn = null;
-    
-    List<WebElement> elements = waitForAll(By.className("x-grid3-col-name"));
-    for (WebElement element : elements){
-      if (element.getText().trim().toLowerCase(Locale.ENGLISH).equals(repositoryName)){
-        repositoryNameColumn = element;
-        break;
-      }
-    }
-    
-    if ( repositoryNameColumn == null ) {
-      throw new NotFoundException("could not find repository " + repositoryName);
-    }
-    
-    return Pages.get(driver, RepositoryPage.class, this);
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoryPage.java b/scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoryPage.java
deleted file mode 100644
index d09a0debb5..0000000000
--- a/scm-webapp/src/test/java/sonia/scm/selenium/page/RepositoryPage.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright (c) 2014, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-package sonia.scm.selenium.page;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-
-/**
- * Page object for scm-manager's repository detail page.
- *
- * @author Sebastian Sdorra
- */
-public class RepositoryPage extends BasePage<RepositoryPage> {
-  
-  @FindBy(css = "#repoRmButton button")
-  private WebElement removeButton;
-  
-  private final RepositoriesPage repositoriesPage;
-  
-  /**
-   * Constructs a new page. This constructor should only be called from {@link Pages}.
-   * 
-   * @param driver selenium test driver
-   * @param repositoriesPage repositories page object
-   */
-  RepositoryPage(WebDriver driver, RepositoriesPage repositoriesPage) {
-    super(driver);
-    this.repositoriesPage = repositoriesPage;
-  }
-
-  @Override
-  protected RepositoryPage self() {
-    return this;
-  }
-  
-  /**
-   * Removes the selected repository.
-   * 
-   * @return repositories overview page object
-   */
-  public RepositoriesPage remove(){
-    removeButton.click();
-    waitToBeClickable(By.cssSelector("div.x-window button:nth-of-type(1)")).click();
-    return repositoriesPage;
-  }
-  
-}

From db1af8a7a4eabc2d9bea7701df2127d314b761be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 13 Nov 2018 11:41:03 +0100
Subject: [PATCH 183/188] Add integration test for security filter

---
 .../sonia/scm/it/AnonymousAccessITCase.java   | 26 +++++++++++++++++++
 .../java/sonia/scm/it/utils/ScmRequests.java  |  4 +++
 2 files changed, 30 insertions(+)
 create mode 100644 scm-it/src/test/java/sonia/scm/it/AnonymousAccessITCase.java

diff --git a/scm-it/src/test/java/sonia/scm/it/AnonymousAccessITCase.java b/scm-it/src/test/java/sonia/scm/it/AnonymousAccessITCase.java
new file mode 100644
index 0000000000..0a329b8e1e
--- /dev/null
+++ b/scm-it/src/test/java/sonia/scm/it/AnonymousAccessITCase.java
@@ -0,0 +1,26 @@
+package sonia.scm.it;
+
+import io.restassured.RestAssured;
+import org.junit.Test;
+import sonia.scm.it.utils.RestUtil;
+import sonia.scm.it.utils.ScmRequests;
+
+import static org.junit.Assert.assertEquals;
+
+public class AnonymousAccessITCase {
+
+  @Test
+  public void shouldAccessIndexResourceWithoutAuthentication() {
+    ScmRequests.start()
+      .requestIndexResource()
+      .assertStatusCode(200);
+  }
+
+  @Test
+  public void shouldRejectUserResourceWithoutAuthentication() {
+    assertEquals(401, RestAssured.given()
+      .when()
+      .get(RestUtil.REST_BASE_URL.resolve("users/"))
+      .statusCode());
+  }
+}
diff --git a/scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java b/scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java
index e784d3b4b1..bde3892773 100644
--- a/scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java
+++ b/scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java
@@ -38,6 +38,10 @@ public class ScmRequests {
     return new ScmRequests();
   }
 
+  public IndexResponse requestIndexResource() {
+    return new IndexResponse(applyGETRequest(RestUtil.REST_BASE_URL.toString()));
+  }
+
   public IndexResponse requestIndexResource(String username, String password) {
     setUsername(username);
     setPassword(password);

From 04592521eed5d3c769fc04db796d38611b4a23ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 14 Nov 2018 07:55:22 +0100
Subject: [PATCH 184/188] Apply peer review results

---
 .../src/main/java/sonia/scm/filter/Filters.java   | 15 +++++++++++++++
 .../sonia/scm/security/SecurityRequestFilter.java |  1 -
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/scm-core/src/main/java/sonia/scm/filter/Filters.java b/scm-core/src/main/java/sonia/scm/filter/Filters.java
index dbdc8f0e7e..d3ac708296 100644
--- a/scm-core/src/main/java/sonia/scm/filter/Filters.java
+++ b/scm-core/src/main/java/sonia/scm/filter/Filters.java
@@ -63,6 +63,21 @@ public final class Filters
   /** post authentication priority */
   public static final int PRIORITY_POST_AUTHENTICATION = 5500;
 
+  /** pre authorization priority */
+  public static final int PRIORITY_POST_AUTHORIZATION = 6500;
+
+  /** post base url priority */
+  public static final int PRIORITY_POST_BASEURL = 1500;
+
+  /** pre authentication priority */
+  public static final int PRIORITY_PRE_AUTHENTICATION = 4500;
+
+  /** pre authorization priority */
+  public static final int PRIORITY_PRE_AUTHORIZATION = 5500;
+
+  /** pre base url priority */
+  public static final int PRIORITY_PRE_BASEURL = 500;
+
   //~--- constructors ---------------------------------------------------------
 
   /**
diff --git a/scm-webapp/src/main/java/sonia/scm/security/SecurityRequestFilter.java b/scm-webapp/src/main/java/sonia/scm/security/SecurityRequestFilter.java
index 6c3723935e..2bbdf6f468 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/SecurityRequestFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/SecurityRequestFilter.java
@@ -24,7 +24,6 @@ public class SecurityRequestFilter  implements ContainerRequestFilter {
   @Override
   public void filter(ContainerRequestContext requestContext) {
     Method resourceMethod = resourceInfo.getResourceMethod();
-    LOG.info("jax-rs method {}", resourceMethod.getName());
     if (hasPermission() || anonymousAccessIsAllowed(resourceMethod)) {
       LOG.debug("allowed unauthenticated request to method {}", resourceMethod);
       // nothing further to do

From 0b8c18a61214ee2500c23de625693546fd023b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 14 Nov 2018 07:12:08 +0000
Subject: [PATCH 185/188] Close branch feature/unathenticated_access


From 08af48bad170aa8f727b902a55f203adf0eda431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 14 Nov 2018 10:41:17 +0100
Subject: [PATCH 186/188] Delete IllegalArgumentExceptionMapper

This was forgotten in error handling feature
---
 .../rest/IllegalArgumentExceptionMapper.java  | 68 -------------------
 .../api/v2/resources/DiffResourceTest.java    |  3 -
 .../scm/api/v2/resources/DispatcherMock.java  |  2 -
 3 files changed, 73 deletions(-)
 delete mode 100644 scm-webapp/src/main/java/sonia/scm/api/rest/IllegalArgumentExceptionMapper.java

diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/IllegalArgumentExceptionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/rest/IllegalArgumentExceptionMapper.java
deleted file mode 100644
index ff29a770cf..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/IllegalArgumentExceptionMapper.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer. 2. Redistributions in
- * binary form must reproduce the above copyright notice, this list of
- * conditions and the following disclaimer in the documentation and/or other
- * materials provided with the distribution. 3. Neither the name of SCM-Manager;
- * nor the names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-
-package sonia.scm.api.rest;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import lombok.extern.slf4j.Slf4j;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-/**
- *
- * @author Sebastian Sdorra
- * @since 1.36
- */
-@Provider
-@Slf4j
-public class IllegalArgumentExceptionMapper
-  implements ExceptionMapper<IllegalArgumentException>
-{
-
-  /**
-   * Method description
-   *
-   *
-   * @param exception
-   *
-   * @return
-   */
-  @Override
-  public Response toResponse(IllegalArgumentException exception)
-  {
-    log.info("caught IllegalArgumentException -- mapping to bad request", exception);
-    return Response.status(Status.BAD_REQUEST).entity(exception.getMessage()).build();
-  }
-}
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
index 0b2fc06cbd..01d5e22b53 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
@@ -19,8 +19,6 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import sonia.scm.NotFoundException;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
-import sonia.scm.api.rest.ContextualExceptionMapper;
-import sonia.scm.api.rest.IllegalArgumentExceptionMapper;
 import sonia.scm.api.v2.NotFoundExceptionMapper;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
@@ -78,7 +76,6 @@ public class DiffResourceTest extends RepositoryTestBase {
     dispatcher.getProviderFactory().register(new NotFoundExceptionMapper(mapper));
     dispatcher.getProviderFactory().registerProvider(AuthorizationExceptionMapper.class);
     dispatcher.getProviderFactory().registerProvider(CRLFInjectionExceptionMapper.class);
-    dispatcher.getProviderFactory().registerProvider(IllegalArgumentExceptionMapper.class);
     when(service.getDiffCommand()).thenReturn(diffCommandBuilder);
     subjectThreadState.bind();
     ThreadContext.bind(subject);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
index 9811f4ec25..9638a8aa49 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DispatcherMock.java
@@ -5,7 +5,6 @@ import org.jboss.resteasy.mock.MockDispatcherFactory;
 import sonia.scm.api.rest.AlreadyExistsExceptionMapper;
 import sonia.scm.api.rest.AuthorizationExceptionMapper;
 import sonia.scm.api.rest.ConcurrentModificationExceptionMapper;
-import sonia.scm.api.rest.IllegalArgumentExceptionMapper;
 import sonia.scm.api.v2.NotFoundExceptionMapper;
 import sonia.scm.api.v2.NotSupportedFeatureExceptionMapper;
 
@@ -21,7 +20,6 @@ public class DispatcherMock {
     dispatcher.getProviderFactory().register(new InternalRepositoryExceptionMapper(mapper));
     dispatcher.getProviderFactory().register(new ChangePasswordNotAllowedExceptionMapper(mapper));
     dispatcher.getProviderFactory().register(new InvalidPasswordExceptionMapper(mapper));
-    dispatcher.getProviderFactory().registerProvider(IllegalArgumentExceptionMapper.class);
     dispatcher.getProviderFactory().register(new NotSupportedFeatureExceptionMapper(mapper));
     return dispatcher;
   }

From 17e2d244f08d3c9c2143d67098350f9faa2d7f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 14 Nov 2018 10:44:58 +0100
Subject: [PATCH 187/188] Fix invalid objects in test

The test does not test the functionality of the user name validation
otherwise but of a melange of all the other validations
---
 .../java/sonia/scm/api/v2/resources/UserRootResourceTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
index 077381cc37..284e7d1d7b 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
@@ -103,7 +103,7 @@ public class UserRootResourceTest {
   @Test
   public void shouldGet400OnCreatingNewUserWithNotAllowedCharacters() throws URISyntaxException {
     // the @ character at the begin of the name is not allowed
-    String userJson = "{ \"name\": \"@user\", \"type\": \"db\" }";
+    String userJson = "{ \"name\": \"@user\",\"active\": true,\"admin\": false,\"displayName\": \"someone\",\"mail\": \"x@example.com\",\"type\": \"db\" }";
     MockHttpRequest request = MockHttpRequest
       .post("/" + UserRootResource.USERS_PATH_V2)
       .contentType(VndMediaType.USER)
@@ -115,7 +115,7 @@ public class UserRootResourceTest {
     assertEquals(400, response.getStatus());
 
     // the whitespace at the begin opf the name is not allowed
-    userJson = "{ \"name\": \" user\", \"type\": \"db\" }";
+    userJson = "{ \"name\": \" user\",\"active\": true,\"admin\": false,\"displayName\": \"someone\",\"mail\": \"x@example.com\",\"type\": \"db\" }";
     request = MockHttpRequest
       .post("/" + UserRootResource.USERS_PATH_V2)
       .contentType(VndMediaType.USER)

From 7eac499f5f6581f69d86593c7ba2788c73c14b83 Mon Sep 17 00:00:00 2001
From: Johannes Schnatterer <johannes.schnatterer@cloudogu.com>
Date: Wed, 14 Nov 2018 15:43:47 +0100
Subject: [PATCH 188/188] Updates mockito version.

Allows for usage with junit jupiter in plugins.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e0e4646e9b..e480d1527b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -741,7 +741,7 @@
 
   <properties>
     <!-- test libraries -->
-    <mockito.version>2.10.0</mockito.version>
+    <mockito.version>2.23.0</mockito.version>
     <hamcrest.version>1.3</hamcrest.version>
     <junit.version>5.2.0</junit.version>