From 08eb8a29e8b8bb55dd7550152740b9df74f6bb54 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Fri, 9 Feb 2018 00:37:09 +0100
Subject: [PATCH] www-apps/gitlab-ce: Add patch for package.json and yarn.lock
 in order to fix dependency errors that cause emerge --config gitlab-ce to
 fail

Package-Manager: Portage-2.3.19, Repoman-2.3.6
---
 www-apps/gitlab-ce/ChangeLog                  |   5 +
 www-apps/gitlab-ce/Manifest                   |   5 +-
 .../files/07-gitlab-ce-10.0.7-yarn.patch      | 988 ++++++++++++++++++
 www-apps/gitlab-ce/gitlab-ce-10.0.7.ebuild    |   1 +
 4 files changed, 997 insertions(+), 2 deletions(-)
 create mode 100644 www-apps/gitlab-ce/files/07-gitlab-ce-10.0.7-yarn.patch

diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog
index d6ec6b2..2f504fa 100644
--- a/www-apps/gitlab-ce/ChangeLog
+++ b/www-apps/gitlab-ce/ChangeLog
@@ -1,3 +1,8 @@
+  08 Feb 2018; Manuel Friedli <manuel@fritteli.ch>
+  +files/07-gitlab-ce-10.0.7-yarn.patch, gitlab-ce-10.0.7.ebuild:
+  www-apps/gitlab-ce:  Add patch for package.json and yarn.lock in order to fix
+  dependency errors that cause emerge --config gitlab-ce to fail
+
 *gitlab-ce-9.5.10 (08 Feb 2018)
 
   08 Feb 2018; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-9.5.10.ebuild,
diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest
index d6799be..5ca28b1 100644
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@@ -7,6 +7,7 @@ AUX 04-gitlab-ce-8.12.7-fix-check-task.patch 917 SHA256 e1adffbd59a418d5e14cbd51
 AUX 04-gitlab-ce-9.3.0-fix-check-task.patch 1090 SHA256 51ade91e5e7ef67e6d3c0e6e1f708156755ad44d42dbc3ccdd4356b259e46846 SHA512 2eacb47df7f9782172ae4f71d8e5fb07f2a830da7733e2ec84b95259a9ee5d454f9c68f93b40251050cedd502761800ec56fe7f502309364e61e9e4431e2b112 WHIRLPOOL 0f7b6a7281eb8dd736b6f329e8511b9145a48450361264465f37aa852bf9d0e4ed265c0292272e75000216ddbd4c285b496aef86a4cfd2944f6819b7a3cc3982
 AUX 05-gitlab-ce-9.0.0-replace-sys-filesystem.patch 2436 SHA256 53fcd9fc123a0fcb671a8cbcb3b2dc61765e32be6836206ae0edea8cf0ae8203 SHA512 21636f298df7e762f59595f39fb50266f8737311f37aa2b9ba96bc29190b8a67eea01b09e3b589d0885da6b27beaa136fa66c7d98408a8e3ecb3ac6baf20d891 WHIRLPOOL e0c709dfc5f72e33207fd7d62a7db5a85c0ed4b6064d5d6a13bcce7d660d9ba144fe09d0985c16c313f06a4e02911729be132086735eac47ddff981874f31acc
 AUX 06-gitlab-ce-8.17.0-fix-webpack-config.patch 614 SHA256 0c1cdc25032322eff6c279435ba5f3fc349b30de0d55d86fad2616bd2bb7fef4 SHA512 f5ccb4d1849ab395ba4ec3c80735a1fedd9fa7f790c8b114d8dc8d1fc2c431d7b9e5645247485f0b8c1061a00ed61c21a5e50f49af0d76e232182c68868a163f WHIRLPOOL 6968ddefed74607c36cc66dc133dbf4942979d2ae867f819cf2e7e5c9701fe8dd86b266d923e6343971e6904f0ad1f35200971660df139edabcc9e0790fc107c
+AUX 07-gitlab-ce-10.0.7-yarn.patch 36442 SHA256 b45cfd739ca94058987c55458c89dba4cdbb1b9b9fc2e486d02e67e275044855 SHA512 931edab62e1218f84f08db72cc2f4ff95e53c6f88d755224de5e9dd19c230bb4b4c808accebd14c7bb06e6c57e4f101f7b4fb1843abb9a908d7f9f2b901d4e5f WHIRLPOOL 0f0ba8a1dfb38355bedebb17a8d174fa33a695be9da364bfebf3ffc5629eff5f462a9b66af65ad0fcc3b35f93c67c4b15a93e1962ae32225dbed45c87b30c5b1
 AUX gitlab-8.13.0-sidekiq.service 990 SHA256 183ccbdb19a3dcc74cf1f1f865bf396466e06f7408ff7d3e92359b2a0e83f24c SHA512 c356baf65337739b08a0a4bfe24d3b68f557e9d6d95f479b39ec954ee6c2077e380f99d1e9e9390f5b038e093c0a46562f651512a6578dfa86977580159470a2 WHIRLPOOL 81d9ea9febf47d5fdb9c49a54bbc499bd796fc56bc1c16404fe4c74d00c4bb9fa9631e4cd4cf88d3c30a44c04b74b35a61cd4da9f2139a4abf61e758b4e5949a
 AUX gitlab-8.13.3-sidekiq.init 1459 SHA256 fdf808f9c0a92d7a77ae8be27c8fc11cec571ec6b5b94e31639028eec19546f1 SHA512 ec2130483b603f2be423c288fd0d55615c831ce995a8a5509f0240f149b3464d8f0a75cade1c736d085fb5f898d109368af62d8fdfb280aa00c4df8c06abb1e9 WHIRLPOOL d3493ac268257386e22c677337c8f9b1050212fce4aa855119b2ccd5f56850a5288d0cdd74e3c2f34552f59f9431c9ab5080e372766b88de003cad5dab015100
 AUX gitlab-8.13.3-unicorn.init 3562 SHA256 f4ae5b785d61fb2c463b2405533d5e9a2209bbff7a085106b463f59505123287 SHA512 4af87415da7e482725a6f97f5e2ffafe0d16784cdcf3f877c99b5f646832c14dd1b3e875ec00e57560060bf3c049dd7fd0aeb7452db1100740e6b17dc29fdfb6 WHIRLPOOL a63d236a76bcbbd6e39268c76a7fbb75f4b9e5488d0cbc0bb2973ae09753f11d1863e477fe88f6c652370c19c3a0f037f99cc681b91679eb4da992db5e2eff20
@@ -27,7 +28,7 @@ DIST gitlab-ce-9.4.7.tar.gz 32854784 SHA256 c6b0db5ced47a92c211ccb9889a21cf5c698
 DIST gitlab-ce-9.5.10.tar.gz 36463237 SHA256 f3adc7d7b31e3d41f6ca9fd47e1285064f148bdd53811970eb8563cdb17af893 SHA512 c1d2de2fbe7ebde26f2b56de2b7d48a4179c4ecb7e1676bffbcbab46cd59a96a46f7d6bb2ccd9af35ffd8d7934a63e72a4a725a5fea36884007ec60e82f47e0e WHIRLPOOL 332ae6f49bf24bc58a5aa55e393aef6d6b892f1d8961ba0ff85f4031cd13b61275679ca259ba14f1efd676dc3320f10e433775df99dc1b40514252b2689095ef
 EBUILD gitlab-ce-10.0.0_rc3.ebuild 13508 SHA256 bb22763056e0686ff308db2bc14e55ed74c4af247eab55f4ba4502ac0fa3f210 SHA512 99f298076aff75183d68b9969e99bba1898501554aa08448539c154b021040d3af7b6f2bac3704511b3b83af7c39d7e42530142a6c5061078ea82fb93aafcbae WHIRLPOOL 129b9b2a0e4d512947c2be0b3143ece02d870f790f9425d5408191aef53e0631bb001390b2438a2f0d4a38b38a679af0909a9df1f9c9a4e3d7448f32110cb997
 EBUILD gitlab-ce-10.0.4.ebuild 13526 SHA256 0fa438ddcca42b2ec6090bdb587635c8e82c9d4fb515427f24b264ab4b70db64 SHA512 dd84a68b17bd5ee193f55519bf83d52385e372dbde672915b4a799d30ecf08e2dd004946fbf73acaefcafce9af20355538a5c0d453ee52f7009deb8403001fe4 WHIRLPOOL db04a3db49544333341a4fbd1b1d3ce49e58106b91da12de0b5b2cfeece52876ce6845e6e8b0fd8048fe40ad3b02e78efc191e716fda52a576c959569a9527d5
-EBUILD gitlab-ce-10.0.7.ebuild 13526 SHA256 258085d5365f3c65aed09ea9515bcf453ee2d6f91368401a885376337b2b0c27 SHA512 2ae1bb85618e73b3765323d0f6e8d2ac35aa471c1051b1559c752d567a7d7e4c1f4e5dd3558e20f5b5ee73d75a29da27914a39333ddf2e6e3818b8ae4496e57b WHIRLPOOL cc299c60414881559d80970d1c78b35ed3bd9d9c59a5ad8aaaf51c676109d72616f048f2c80c4bd125c889a35fb45a2f2e48ae7a2db68979805820de2a0df5ae
+EBUILD gitlab-ce-10.0.7.ebuild 13568 SHA256 c164db3f0af93824bb97992b20b0bc5415bbc701c80469593038c773c453b976 SHA512 ba702162d9fad73d46953649c9faf913069f2059fbd253d8019224c1645c56cb6c0ec69893be6238e42ee3d54bbcd9a22343eece1975e084d7ff73d4efbb79dd WHIRLPOOL 37f6ebb5c9e4a60df200272235dca55819b81936cb8f74a43fff7a79a3330666587d082e18cdca20ecd610eea0b18c86eadf183353f83e72606d1ccffb756949
 EBUILD gitlab-ce-9.0.13.ebuild 13139 SHA256 ecdcd1d6ca3999eb4b299628bac4c97a231cfcf682569cc1a0c11241cfcb6099 SHA512 8a6b8f3f05f54a752d57651b34ba4f6310e6695ea6eea1bbebe4a1dd38aa9ea0e9030bd59448a886918e20ea81f1b167236712e21fb6c43b7fb50b79565e2d87 WHIRLPOOL 0873a646dcb208e8c006e0e587fc03003594fd00e790e22d89839c9ffb8b7403a2df7b306ddfb817ea10a32e58d095d97989591de18ca78782bd468ae1fb8bc7
 EBUILD gitlab-ce-9.1.10.ebuild 13295 SHA256 a69c179d072e76597091d825956bc308a25757a95406444a95a4ccbe9fe8ee9e SHA512 cc01ae887bce9e838eb020c7b414de4f80c5cc94762bd7c65fc5f6ab732b3ac7447f3f136b054557a5a93d09ed946b821d027fe29d7fdeea6eaaa6fc336cf394 WHIRLPOOL 1778e46da386704fbecc9e62769b9ab6ccdb40ee1028ef33607b4668e3fafbd0996ff4397128d8320098e3bf5c8f1d47a227e3c61a73a26a63663223790c8107
 EBUILD gitlab-ce-9.2.10.ebuild 13040 SHA256 ace7b7561f499e43c19284153358b718275ac55792650391f39fa4ab89941c20 SHA512 22c8723251fefd50739ac082f04c377543f659720346cd29680d4956a2d6a37bb27b2c6beb723c09f49d7e478375e6679940f63f43c644564155a0eaffe300ed WHIRLPOOL 9601c5fcdc9b8d753a58ea4b4606957f3d09e63834335703896f55b16c41df7b81ef00b64e57f4409322789dcaa3745d60b31a973950c99037895d71a38ddaf2
@@ -35,5 +36,5 @@ EBUILD gitlab-ce-9.3.11.ebuild 13699 SHA256 e56490b1f59cf32e84d65ba3c91231c07a41
 EBUILD gitlab-ce-9.4.7.ebuild 13526 SHA256 5078d51dcca18d9c5380bff25d494437506482beb4e586727b577f1c475363ec SHA512 244e178828910739018fa794c9f03c8f3b0411e45298800eaf828099f9d468b01d73102c9183ce6552d4ba208c086e5b4de85b4e0427e5502b9a54d56cb6a636 WHIRLPOOL 0306b7fc67f570d2ece6cc321461604c2be4fe886122750a481c6573800bbb4164c4cecee54a29a408b1eee17aa479a54271b395575d2d606dbd2ec3ddc4a1ae
 EBUILD gitlab-ce-9.5.10.ebuild 13526 SHA256 6e7c361f31989dd608eff4c8dd01b7301b142b4d38acdf38e61e2eecb2d4b285 SHA512 e33e56c8e49bd2ef03dd9af508b186f7908b8502960cbdb95ca9166631b84d5357c4965c0919e432ee5de9b9eeb33f68773ac405c24430568f9abb0d8e7354a6 WHIRLPOOL 3e866d785e8018096a92a223a2f6cedf4398cc07726a183d805005b3cd718fed2296edd63f5bc9d2b8849fe2298e9a61bf998a2241de2cd5ab4527f8ddaed325
 EBUILD gitlab-ce-9999.ebuild 13468 SHA256 ab13060918b09a67f3f0c653a3836c1077933c606e5ea4e3416fde204aa530af SHA512 f14bc61622929dc57460fd7e4b3d965437fdc44706c52608a6b278021960bb70b62f81a6dd38beeb134c0f40ef29a81e07ea5a49c9a7a8e7ab63f55529231cb8 WHIRLPOOL 204d2f97890f2868b9f890fcc9b03d3c47c6916e52af341cf946e197acd8c2287409a5a1e525183a62fec9588eaa21b9d3ad30bba3b12267aa4c9e1163ca7fb0
-MISC ChangeLog 25422 SHA256 e52aea65b8cd561aca9401c42f168600a8ebb39c452f0fc70084ae64a83377d5 SHA512 181486868bda0c1d2e7d8ee14c06e57abd80d1e26716fb464c548e21e11b5cd89962d0ddfa2f6cee51fdeb2c5c7f2b4cb47002a22f6fc82bd91748727cbe7ba3 WHIRLPOOL 43a953997b1b344c21ac61b86d14c0951ee438ac0d3a87c02393646ee5108611c09092e452ca6931eb1bbab20096ba4ff02c21daea2ccc28b4f59a027dfcc70f
+MISC ChangeLog 25685 SHA256 6b1b52180c68766cc39f91e740fb3308537a899e055f41c4cb0091f22194a2d4 SHA512 133578ba1dc5aa4ed555ffaa1c67c0a9f75daa72ece5cc9151ec78ff90701c0afbe3552ff425e69ecdb351b8390dbf73e78ec0fa2d7d1f70a1712fd20c63f40a WHIRLPOOL 0edf627bfe33cd9620197c8c61c3732b8e346a6cead257cdfbf0f952606e1bd74b1911d7fea23f55710cc3bc7aa66d61be9b246314d8bbcc7ac6e3022501566d
 MISC metadata.xml 801 SHA256 3dc7486a12903f47f65968d524c93500ba30a4a09fa57e5a9dacf356509b44bb SHA512 e132754b72e64246531fa883400a0cf1a473ac5a6a49623db58ccf118a038b7cf37df03d9550f37b4a25f9ddbb1dcc5652ec9a4f2259d8e3ce202692c4025f41 WHIRLPOOL e9d961681fd790008eaf80fa07ce2c55a00a58f2e920d759793783ca8c8f508602a777e94c0cb65fe87c7dbef0cabdf26e4f4082584421097d939cbab20c4ac6
diff --git a/www-apps/gitlab-ce/files/07-gitlab-ce-10.0.7-yarn.patch b/www-apps/gitlab-ce/files/07-gitlab-ce-10.0.7-yarn.patch
new file mode 100644
index 0000000..8b25f66
--- /dev/null
+++ b/www-apps/gitlab-ce/files/07-gitlab-ce-10.0.7-yarn.patch
@@ -0,0 +1,988 @@
+diff --git a/package.json b/package.json
+index feae6ca..dc0d822 100644
+--- a/package.json
++++ b/package.json
+@@ -71,11 +71,11 @@
+   },
+   "devDependencies": {
+     "babel-plugin-istanbul": "^4.0.0",
+-    "eslint": "^3.10.1",
+-    "eslint-config-airbnb-base": "^10.0.1",
++    "eslint": "^4.0.0",
++    "eslint-config-airbnb-base": "^12.0.0",
+     "eslint-import-resolver-webpack": "^0.8.3",
+     "eslint-plugin-filenames": "^1.1.0",
+-    "eslint-plugin-import": "^2.2.0",
++    "eslint-plugin-import": "^2.6.0",
+     "eslint-plugin-jasmine": "^2.1.0",
+     "eslint-plugin-promise": "^3.5.0",
+     "istanbul": "^0.4.5",
+diff --git a/yarn.lock b/yarn.lock
+index de4a9ac..411a469 100644
+--- a/yarn.lock
++++ b/yarn.lock
+@@ -33,28 +33,25 @@ acorn@^4.0.3:
+   version "4.0.13"
+   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+ 
+-acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.1:
++acorn@^5.0.0, acorn@^5.0.3:
+   version "5.1.1"
+   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75"
+ 
++acorn@^5.4.0:
++  version "5.4.1"
++  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
++
+ after@0.8.2:
+   version "0.8.2"
+   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+ 
+-ajv-keywords@^1.0.0:
+-  version "1.5.1"
+-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
+-
+ ajv-keywords@^2.0.0:
+   version "2.1.0"
+   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
+ 
+-ajv@^4.7.0:
+-  version "4.11.2"
+-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.2.tgz#f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6"
+-  dependencies:
+-    co "^4.6.0"
+-    json-stable-stringify "^1.0.1"
++ajv-keywords@^2.1.0:
++  version "2.1.1"
++  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
+ 
+ ajv@^4.9.1:
+   version "4.11.8"
+@@ -72,6 +69,15 @@ ajv@^5.1.5:
+     json-schema-traverse "^0.3.0"
+     json-stable-stringify "^1.0.1"
+ 
++ajv@^5.2.3, 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"
++
+ align-text@^0.1.1, align-text@^0.1.3:
+   version "0.1.4"
+   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+@@ -88,9 +94,9 @@ amdefine@>=0.0.4:
+   version "1.0.1"
+   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+ 
+-ansi-escapes@^1.1.0:
+-  version "1.4.0"
+-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
++ansi-escapes@^3.0.0:
++  version "3.0.0"
++  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+ 
+ ansi-html@0.0.5:
+   version "0.0.5"
+@@ -104,10 +110,20 @@ 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@^2.2.1:
+   version "2.2.1"
+   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+ 
++ansi-styles@^3.1.0:
++  version "3.2.0"
++  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
++  dependencies:
++    color-convert "^1.9.0"
++
+ anymatch@^1.3.0:
+   version "1.3.2"
+   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+@@ -278,14 +294,6 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.22.0:
+     esutils "^2.0.2"
+     js-tokens "^3.0.0"
+ 
+-babel-code-frame@^6.16.0:
+-  version "6.26.0"
+-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+-  dependencies:
+-    chalk "^1.1.3"
+-    esutils "^2.0.2"
+-    js-tokens "^3.0.2"
+-
+ babel-core@^6.22.1, babel-core@^6.23.0:
+   version "6.23.1"
+   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df"
+@@ -990,7 +998,7 @@ brace-expansion@^1.0.0:
+     balanced-match "^0.4.1"
+     concat-map "0.0.1"
+ 
+-brace-expansion@^1.1.8:
++brace-expansion@^1.1.7, brace-expansion@^1.1.8:
+   version "1.1.8"
+   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+   dependencies:
+@@ -1170,7 +1178,7 @@ center-align@^0.1.1:
+     align-text "^0.1.3"
+     lazy-cache "^1.0.3"
+ 
+-chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
++chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.3:
+   version "1.1.3"
+   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+   dependencies:
+@@ -1180,6 +1188,18 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.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.1.0:
++  version "2.3.0"
++  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
++  dependencies:
++    ansi-styles "^3.1.0"
++    escape-string-regexp "^1.0.5"
++    supports-color "^4.0.0"
++
++chardet@^0.4.0:
++  version "0.4.2"
++  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
++
+ chokidar@^1.4.1, chokidar@^1.4.3, chokidar@^1.6.0, chokidar@^1.7.0:
+   version "1.7.0"
+   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+@@ -1211,11 +1231,11 @@ clap@^1.0.9:
+   dependencies:
+     chalk "^1.1.3"
+ 
+-cli-cursor@^1.0.1:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
++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 "^1.0.1"
++    restore-cursor "^2.0.0"
+ 
+ cli-width@^2.0.0:
+   version "2.1.0"
+@@ -1269,6 +1289,12 @@ color-convert@^1.3.0:
+   dependencies:
+     color-name "^1.1.1"
+ 
++color-convert@^1.9.0:
++  version "1.9.1"
++  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
++  dependencies:
++    color-name "^1.1.1"
++
+ color-name@^1.0.0, color-name@^1.1.1:
+   version "1.1.2"
+   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
+@@ -1366,7 +1392,7 @@ 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.2:
++concat-stream@^1.6.0:
+   version "1.6.0"
+   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+   dependencies:
+@@ -1520,7 +1546,7 @@ cropper@^2.3.0:
+   dependencies:
+     jquery ">= 1.9.1"
+ 
+-cross-spawn@^5.0.1:
++cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+   version "5.1.0"
+   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+   dependencies:
+@@ -1698,6 +1724,18 @@ debug@2.6.8, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.4.5, debug@^2.6.
+   dependencies:
+     ms "2.0.0"
+ 
++debug@^2.6.9:
++  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.1.0"
++  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
++  dependencies:
++    ms "2.0.0"
++
+ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
+   version "1.2.0"
+   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+@@ -1834,12 +1872,11 @@ doctrine@1.5.0:
+     esutils "^2.0.2"
+     isarray "^1.0.0"
+ 
+-doctrine@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
++doctrine@^2.1.0:
++  version "2.1.0"
++  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+   dependencies:
+     esutils "^2.0.2"
+-    isarray "^1.0.0"
+ 
+ document-register-element@^1.3.0:
+   version "1.3.0"
+@@ -2125,17 +2162,18 @@ escope@^3.6.0:
+     esrecurse "^4.1.0"
+     estraverse "^4.1.1"
+ 
+-eslint-config-airbnb-base@^10.0.1:
+-  version "10.0.1"
+-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-10.0.1.tgz#f17d4e52992c1d45d1b7713efbcd5ecd0e7e0506"
++eslint-config-airbnb-base@^12.0.0:
++  version "12.1.0"
++  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-12.1.0.tgz#386441e54a12ccd957b0a92564a4bafebd747944"
++  dependencies:
++    eslint-restricted-globals "^0.1.1"
+ 
+-eslint-import-resolver-node@^0.2.0:
+-  version "0.2.3"
+-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c"
++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"
+   dependencies:
+-    debug "^2.2.0"
+-    object-assign "^4.0.1"
+-    resolve "^1.1.6"
++    debug "^2.6.9"
++    resolve "^1.5.0"
+ 
+ eslint-import-resolver-webpack@^0.8.3:
+   version "0.8.3"
+@@ -2153,11 +2191,11 @@ eslint-import-resolver-webpack@^0.8.3:
+     resolve "^1.2.0"
+     semver "^5.3.0"
+ 
+-eslint-module-utils@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce"
++eslint-module-utils@^2.1.1:
++  version "2.1.1"
++  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449"
+   dependencies:
+-    debug "2.2.0"
++    debug "^2.6.8"
+     pkg-dir "^1.0.0"
+ 
+ eslint-plugin-filenames@^1.1.0:
+@@ -2174,20 +2212,20 @@ eslint-plugin-html@^2.0.1:
+   dependencies:
+     htmlparser2 "^3.8.2"
+ 
+-eslint-plugin-import@^2.2.0:
+-  version "2.2.0"
+-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.2.0.tgz#72ba306fad305d67c4816348a4699a4229ac8b4e"
++eslint-plugin-import@^2.6.0:
++  version "2.8.0"
++  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz#fa1b6ef31fcb3c501c09859c1b86f1fc5b986894"
+   dependencies:
+     builtin-modules "^1.1.1"
+     contains-path "^0.1.0"
+-    debug "^2.2.0"
++    debug "^2.6.8"
+     doctrine "1.5.0"
+-    eslint-import-resolver-node "^0.2.0"
+-    eslint-module-utils "^2.0.0"
++    eslint-import-resolver-node "^0.3.1"
++    eslint-module-utils "^2.1.1"
+     has "^1.0.1"
+     lodash.cond "^4.3.0"
+     minimatch "^3.0.3"
+-    pkg-up "^1.0.0"
++    read-pkg-up "^2.0.0"
+ 
+ eslint-plugin-jasmine@^2.1.0:
+   version "2.2.0"
+@@ -2197,51 +2235,68 @@ eslint-plugin-promise@^3.5.0:
+   version "3.5.0"
+   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca"
+ 
+-eslint@^3.10.1:
+-  version "3.19.0"
+-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
++eslint-restricted-globals@^0.1.1:
++  version "0.1.1"
++  resolved "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz#35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7"
++
++eslint-scope@^3.7.1:
++  version "3.7.1"
++  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
+   dependencies:
+-    babel-code-frame "^6.16.0"
+-    chalk "^1.1.3"
+-    concat-stream "^1.5.2"
+-    debug "^2.1.1"
+-    doctrine "^2.0.0"
+-    escope "^3.6.0"
+-    espree "^3.4.0"
++    esrecurse "^4.1.0"
++    estraverse "^4.1.1"
++
++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"
++
++eslint@^4.0.0:
++  version "4.17.0"
++  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.17.0.tgz#dc24bb51ede48df629be7031c71d9dc0ee4f3ddf"
++  dependencies:
++    ajv "^5.3.0"
++    babel-code-frame "^6.22.0"
++    chalk "^2.1.0"
++    concat-stream "^1.6.0"
++    cross-spawn "^5.1.0"
++    debug "^3.1.0"
++    doctrine "^2.1.0"
++    eslint-scope "^3.7.1"
++    eslint-visitor-keys "^1.0.0"
++    espree "^3.5.2"
+     esquery "^1.0.0"
+-    estraverse "^4.2.0"
+     esutils "^2.0.2"
+     file-entry-cache "^2.0.0"
+-    glob "^7.0.3"
+-    globals "^9.14.0"
+-    ignore "^3.2.0"
++    functional-red-black-tree "^1.0.1"
++    glob "^7.1.2"
++    globals "^11.0.1"
++    ignore "^3.3.3"
+     imurmurhash "^0.1.4"
+-    inquirer "^0.12.0"
+-    is-my-json-valid "^2.10.0"
++    inquirer "^3.0.6"
+     is-resolvable "^1.0.0"
+-    js-yaml "^3.5.1"
+-    json-stable-stringify "^1.0.0"
++    js-yaml "^3.9.1"
++    json-stable-stringify-without-jsonify "^1.0.1"
+     levn "^0.3.0"
+-    lodash "^4.0.0"
+-    mkdirp "^0.5.0"
++    lodash "^4.17.4"
++    minimatch "^3.0.2"
++    mkdirp "^0.5.1"
+     natural-compare "^1.4.0"
+     optionator "^0.8.2"
+-    path-is-inside "^1.0.1"
+-    pluralize "^1.2.1"
+-    progress "^1.1.8"
+-    require-uncached "^1.0.2"
+-    shelljs "^0.7.5"
+-    strip-bom "^3.0.0"
++    path-is-inside "^1.0.2"
++    pluralize "^7.0.0"
++    progress "^2.0.0"
++    require-uncached "^1.0.3"
++    semver "^5.3.0"
++    strip-ansi "^4.0.0"
+     strip-json-comments "~2.0.1"
+-    table "^3.7.8"
++    table "^4.0.1"
+     text-table "~0.2.0"
+-    user-home "^2.0.0"
+ 
+-espree@^3.4.0:
+-  version "3.5.0"
+-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.0.tgz#98358625bdd055861ea27e2867ea729faf463d8d"
++espree@^3.5.2:
++  version "3.5.3"
++  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.3.tgz#931e0af64e7fbbed26b050a29daad1fc64799fa6"
+   dependencies:
+-    acorn "^5.1.1"
++    acorn "^5.4.0"
+     acorn-jsx "^3.0.0"
+ 
+ esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
+@@ -2273,7 +2328,7 @@ estraverse@^1.9.1:
+   version "1.9.3"
+   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+ 
+-estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
++estraverse@^4.0.0, estraverse@^4.1.1:
+   version "4.2.0"
+   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+ 
+@@ -2344,10 +2399,6 @@ execa@^0.7.0:
+     signal-exit "^3.0.0"
+     strip-eof "^1.0.0"
+ 
+-exit-hook@^1.0.0:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+-
+ expand-braces@^0.1.1:
+   version "0.1.2"
+   resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
+@@ -2419,6 +2470,14 @@ extend@^3.0.0, extend@~3.0.0:
+   version "3.0.1"
+   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+ 
++external-editor@^2.0.4:
++  version "2.1.0"
++  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
++  dependencies:
++    chardet "^0.4.0"
++    iconv-lite "^0.4.17"
++    tmp "^0.0.33"
++
+ extglob@^0.3.1:
+   version "0.3.2"
+   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+@@ -2433,6 +2492,14 @@ fast-deep-equal@^0.1.0:
+   version "0.1.0"
+   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz#5c6f4599aba6b333ee3342e2ed978672f1001f8d"
+ 
++fast-deep-equal@^1.0.0:
++  version "1.0.0"
++  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
++
++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"
++
+ fast-levenshtein@~2.0.4:
+   version "2.0.6"
+   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+@@ -2459,12 +2526,11 @@ faye-websocket@~0.7.3:
+   dependencies:
+     websocket-driver ">=0.3.6"
+ 
+-figures@^1.3.5:
+-  version "1.7.0"
+-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
++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"
+-    object-assign "^4.1.0"
+ 
+ file-entry-cache@^2.0.0:
+   version "2.0.0"
+@@ -2646,6 +2712,10 @@ function-bind@^1.0.2:
+   version "1.1.0"
+   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
+ 
++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"
++
+ gauge@~2.7.3:
+   version "2.7.4"
+   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+@@ -2659,16 +2729,6 @@ gauge@~2.7.3:
+     strip-ansi "^3.0.1"
+     wide-align "^1.1.0"
+ 
+-generate-function@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+-
+-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"
+-  dependencies:
+-    is-property "^1.0.0"
+-
+ get-caller-file@^1.0.1:
+   version "1.0.2"
+   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+@@ -2720,36 +2780,36 @@ glob@^6.0.4:
+     once "^1.3.0"
+     path-is-absolute "^1.0.0"
+ 
+-glob@^7.0.0, glob@^7.1.1:
+-  version "7.1.2"
+-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
++glob@^7.0.3, glob@^7.0.5:
++  version "7.1.1"
++  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+   dependencies:
+     fs.realpath "^1.0.0"
+     inflight "^1.0.4"
+     inherits "2"
+-    minimatch "^3.0.4"
++    minimatch "^3.0.2"
+     once "^1.3.0"
+     path-is-absolute "^1.0.0"
+ 
+-glob@^7.0.3, glob@^7.0.5:
+-  version "7.1.1"
+-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
++glob@^7.1.1, glob@^7.1.2:
++  version "7.1.2"
++  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+   dependencies:
+     fs.realpath "^1.0.0"
+     inflight "^1.0.4"
+     inherits "2"
+-    minimatch "^3.0.2"
++    minimatch "^3.0.4"
+     once "^1.3.0"
+     path-is-absolute "^1.0.0"
+ 
++globals@^11.0.1:
++  version "11.3.0"
++  resolved "https://registry.yarnpkg.com/globals/-/globals-11.3.0.tgz#e04fdb7b9796d8adac9c8f64c14837b2313378b0"
++
+ globals@^9.0.0:
+   version "9.14.0"
+   resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034"
+ 
+-globals@^9.14.0:
+-  version "9.18.0"
+-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+-
+ globby@^5.0.0:
+   version "5.0.0"
+   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+@@ -3018,6 +3078,10 @@ iconv-lite@0.4.15:
+   version "0.4.15"
+   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
+ 
++iconv-lite@^0.4.17:
++  version "0.4.19"
++  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
++
+ icss-replace-symbols@^1.0.2:
+   version "1.0.2"
+   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
+@@ -3030,9 +3094,9 @@ ignore-by-default@^1.0.0:
+   version "1.0.1"
+   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
+ 
+-ignore@^3.2.0:
+-  version "3.3.3"
+-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
++ignore@^3.3.3:
++  version "3.3.7"
++  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+ 
+ immediate@~3.0.5:
+   version "3.0.6"
+@@ -3086,22 +3150,23 @@ ini@^1.3.4, ini@~1.3.0:
+   version "1.3.4"
+   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
+ 
+-inquirer@^0.12.0:
+-  version "0.12.0"
+-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
++inquirer@^3.0.6:
++  version "3.3.0"
++  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+   dependencies:
+-    ansi-escapes "^1.1.0"
+-    ansi-regex "^2.0.0"
+-    chalk "^1.0.0"
+-    cli-cursor "^1.0.1"
++    ansi-escapes "^3.0.0"
++    chalk "^2.0.0"
++    cli-cursor "^2.1.0"
+     cli-width "^2.0.0"
+-    figures "^1.3.5"
++    external-editor "^2.0.4"
++    figures "^2.0.0"
+     lodash "^4.3.0"
+-    readline2 "^1.0.1"
+-    run-async "^0.1.0"
+-    rx-lite "^3.1.2"
+-    string-width "^1.0.1"
+-    strip-ansi "^3.0.0"
++    mute-stream "0.0.7"
++    run-async "^2.2.0"
++    rx-lite "^4.0.8"
++    rx-lite-aggregates "^4.0.8"
++    string-width "^2.1.0"
++    strip-ansi "^4.0.0"
+     through "^2.3.6"
+ 
+ internal-ip@^1.2.0:
+@@ -3213,15 +3278,6 @@ is-glob@^3.1.0:
+   dependencies:
+     is-extglob "^2.1.0"
+ 
+-is-my-json-valid@^2.10.0:
+-  version "2.16.0"
+-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
+-  dependencies:
+-    generate-function "^2.0.0"
+-    generate-object-property "^1.1.0"
+-    jsonpointer "^4.0.0"
+-    xtend "^4.0.0"
+-
+ is-npm@^1.0.0:
+   version "1.0.0"
+   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
+@@ -3268,9 +3324,9 @@ is-primitive@^2.0.0:
+   version "2.0.0"
+   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+ 
+-is-property@^1.0.0:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
++is-promise@^2.1.0:
++  version "2.1.0"
++  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+ 
+ is-redirect@^1.0.0:
+   version "1.0.0"
+@@ -3483,10 +3539,6 @@ js-tokens@^3.0.0:
+   version "3.0.1"
+   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+ 
+-js-tokens@^3.0.2:
+-  version "3.0.2"
+-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+-
+ js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.7.0:
+   version "3.8.1"
+   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.1.tgz#782ba50200be7b9e5a8537001b7804db3ad02628"
+@@ -3494,9 +3546,9 @@ js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.7.0:
+     argparse "^1.0.7"
+     esprima "^3.1.1"
+ 
+-js-yaml@^3.5.1:
+-  version "3.9.1"
+-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
++js-yaml@^3.9.1:
++  version "3.10.0"
++  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
+   dependencies:
+     argparse "^1.0.7"
+     esprima "^4.0.0"
+@@ -3532,7 +3584,11 @@ json-schema@0.2.3:
+   version "0.2.3"
+   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+ 
+-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
++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"
++
++json-stable-stringify@^1.0.1:
+   version "1.0.1"
+   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+   dependencies:
+@@ -3560,10 +3616,6 @@ jsonify@~0.0.0:
+   version "0.0.0"
+   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+ 
+-jsonpointer@^4.0.0:
+-  version "4.0.1"
+-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+-
+ jsprim@^1.2.2:
+   version "1.4.1"
+   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+@@ -3887,7 +3939,7 @@ lodash@^3.8.0:
+   version "3.10.1"
+   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+ 
+-lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
++lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
+   version "4.17.4"
+   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+ 
+@@ -4132,9 +4184,9 @@ multicast-dns@^6.0.1:
+     dns-packet "^1.0.1"
+     thunky "^0.1.0"
+ 
+-mute-stream@0.0.5:
+-  version "0.0.5"
+-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
++mute-stream@0.0.7:
++  version "0.0.7"
++  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+ 
+ name-all-modules-plugin@^1.0.1:
+   version "1.0.1"
+@@ -4383,9 +4435,11 @@ once@1.x, once@^1.3.0, once@^1.3.3, once@^1.4.0:
+   dependencies:
+     wrappy "1"
+ 
+-onetime@^1.0.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
++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"
+ 
+ opener@^1.4.3:
+   version "1.4.3"
+@@ -4567,7 +4621,7 @@ 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-is-inside@^1.0.1:
++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"
+ 
+@@ -4649,15 +4703,9 @@ pkg-dir@^2.0.0:
+   dependencies:
+     find-up "^2.1.0"
+ 
+-pkg-up@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-1.0.0.tgz#3e08fb461525c4421624a33b9f7e6d0af5b05a26"
+-  dependencies:
+-    find-up "^1.0.0"
+-
+-pluralize@^1.2.1:
+-  version "1.2.1"
+-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
++pluralize@^7.0.0:
++  version "7.0.0"
++  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+ 
+ portfinder@^1.0.9:
+   version "1.0.13"
+@@ -4958,9 +5006,9 @@ process@^0.11.0, process@~0.11.0:
+   version "0.11.9"
+   resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
+ 
+-progress@^1.1.8:
+-  version "1.1.8"
+-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
++progress@^2.0.0:
++  version "2.0.0"
++  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
+ 
+ proto-list@~1.2.1:
+   version "1.2.4"
+@@ -5197,20 +5245,6 @@ readdirp@^2.0.0:
+     readable-stream "^2.0.2"
+     set-immediate-shim "^1.0.1"
+ 
+-readline2@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
+-  dependencies:
+-    code-point-at "^1.0.0"
+-    is-fullwidth-code-point "^1.0.0"
+-    mute-stream "0.0.5"
+-
+-rechoir@^0.6.2:
+-  version "0.6.2"
+-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+-  dependencies:
+-    resolve "^1.1.6"
+-
+ recursive-readdir@2.1.1:
+   version "2.1.1"
+   resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.1.1.tgz#a01cfc7f7f38a53ec096a096f63a50489c3e297c"
+@@ -5360,7 +5394,7 @@ 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"
+ 
+-require-uncached@^1.0.2:
++require-uncached@^1.0.3:
+   version "1.0.3"
+   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+   dependencies:
+@@ -5379,16 +5413,22 @@ resolve@1.1.x:
+   version "1.1.7"
+   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+ 
+-resolve@^1.1.6, resolve@^1.2.0:
++resolve@^1.2.0:
+   version "1.2.0"
+   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c"
+ 
+-restore-cursor@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
++resolve@^1.5.0:
++  version "1.5.0"
++  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
++  dependencies:
++    path-parse "^1.0.5"
++
++restore-cursor@^2.0.0:
++  version "2.0.0"
++  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+   dependencies:
+-    exit-hook "^1.0.0"
+-    onetime "^1.0.0"
++    onetime "^2.0.0"
++    signal-exit "^3.0.2"
+ 
+ right-align@^0.1.1:
+   version "0.1.3"
+@@ -5406,15 +5446,21 @@ ripemd160@^1.0.0:
+   version "1.0.1"
+   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"
+ 
+-run-async@^0.1.0:
+-  version "0.1.0"
+-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
++run-async@^2.2.0:
++  version "2.3.0"
++  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+   dependencies:
+-    once "^1.3.0"
++    is-promise "^2.1.0"
+ 
+-rx-lite@^3.1.2:
+-  version "3.1.2"
+-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
++rx-lite-aggregates@^4.0.8:
++  version "4.0.8"
++  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
++  dependencies:
++    rx-lite "*"
++
++rx-lite@*, rx-lite@^4.0.8:
++  version "4.0.8"
++  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+ 
+ safe-buffer@5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+   version "5.1.1"
+@@ -5535,19 +5581,11 @@ shebang-regex@^1.0.0:
+   version "1.0.0"
+   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+ 
+-shelljs@^0.7.5:
+-  version "0.7.8"
+-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
+-  dependencies:
+-    glob "^7.0.0"
+-    interpret "^1.0.0"
+-    rechoir "^0.6.2"
+-
+ sigmund@^1.0.1:
+   version "1.0.1"
+   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+ 
+-signal-exit@^3.0.0:
++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"
+ 
+@@ -5555,9 +5593,11 @@ slash@^1.0.0:
+   version "1.0.0"
+   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+ 
+-slice-ansi@0.0.4:
+-  version "0.0.4"
+-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
++slice-ansi@1.0.0:
++  version "1.0.0"
++  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
++  dependencies:
++    is-fullwidth-code-point "^2.0.0"
+ 
+ slide@^1.1.5:
+   version "1.1.6"
+@@ -5805,6 +5845,13 @@ string-width@^2.0.0:
+     is-fullwidth-code-point "^2.0.0"
+     strip-ansi "^3.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@^0.10.25, string_decoder@~0.10.x:
+   version "0.10.31"
+   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+@@ -5825,6 +5872,12 @@ strip-ansi@3.0.1, strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+   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"
+@@ -5859,6 +5912,12 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2, supports-co
+   dependencies:
+     has-flag "^1.0.0"
+ 
++supports-color@^4.0.0:
++  version "4.5.0"
++  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
++  dependencies:
++    has-flag "^2.0.0"
++
+ supports-color@^4.2.1:
+   version "4.2.1"
+   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
+@@ -5877,16 +5936,16 @@ svgo@^0.7.0:
+     sax "~1.2.1"
+     whet.extend "~0.9.9"
+ 
+-table@^3.7.8:
+-  version "3.8.3"
+-  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
++table@^4.0.1:
++  version "4.0.2"
++  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
+   dependencies:
+-    ajv "^4.7.0"
+-    ajv-keywords "^1.0.0"
+-    chalk "^1.1.1"
+-    lodash "^4.0.0"
+-    slice-ansi "0.0.4"
+-    string-width "^2.0.0"
++    ajv "^5.2.3"
++    ajv-keywords "^2.1.0"
++    chalk "^2.1.0"
++    lodash "^4.17.4"
++    slice-ansi "1.0.0"
++    string-width "^2.1.1"
+ 
+ tapable@^0.1.8:
+   version "0.1.10"
+@@ -5989,7 +6048,7 @@ tmp@0.0.31:
+   dependencies:
+     os-tmpdir "~1.0.1"
+ 
+-tmp@0.0.x:
++tmp@0.0.x, tmp@^0.0.33:
+   version "0.0.33"
+   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+   dependencies:
+@@ -6186,12 +6245,6 @@ url@^0.11.0:
+     punycode "1.3.2"
+     querystring "0.2.0"
+ 
+-user-home@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
+-  dependencies:
+-    os-homedir "^1.0.0"
+-
+ useragent@^2.1.12:
+   version "2.2.1"
+   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
diff --git a/www-apps/gitlab-ce/gitlab-ce-10.0.7.ebuild b/www-apps/gitlab-ce/gitlab-ce-10.0.7.ebuild
index fe13d59..8af363e 100644
--- a/www-apps/gitlab-ce/gitlab-ce-10.0.7.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-10.0.7.ebuild
@@ -93,6 +93,7 @@ PATCHES=(
 	"${FILESDIR}/04-${PN}-9.3.0-fix-check-task.patch"
 	"${FILESDIR}/05-${PN}-9.0.0-replace-sys-filesystem.patch"
 	"${FILESDIR}/06-${PN}-8.17.0-fix-webpack-config.patch"
+	"${FILESDIR}/07-${PN}-10.0.7-yarn.patch"
 )
 
 MY_NAME="gitlab"