Merge branch 'mg-fix-yarn-deduplicate' into 'master'

Fix "yarn-deduplicate has unmet dependencies" See merge request gitlab-org/gitlab-ce!25885

Merge branch 'mg-fix-yarn-deduplicate' into 'master'
Fix "yarn-deduplicate has unmet dependencies" See merge request gitlab-org/gitlab-ce!25885
405ce60b · Kushal Pandya · dd930fae · f8a96df8 · 405ce60b · 405ce60b
Commit 405ce60b authored Mar 07, 2019 by Kushal Pandya
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

package.json package.json +1 -1

yarn.lock yarn.lock +4 -4

No files found.
--- a/package.json
+++ b/package.json
@@ -175,7 +175,7 @@
    "stylelint-scss": "^3.5.3",
    "vue-jest": "^4.0.0-beta.2",
    "webpack-dev-server": "^3.1.14",
-    "yarn-deduplicate": "^1.1.0"
+    "yarn-deduplicate": "^1.1.1"
  },
  "resolutions": {
    "vue-jest/ts-jest": "24.0.0"

--- a/yarn.lock
+++ b/yarn.lock
@@ -11162,10 +11162,10 @@ yargs@^12.0.2, yargs@^12.0.4:
    y18n "^3.2.1 || ^4.0.0"
    yargs-parser "^11.1.1"
-yarn-deduplicate@^1.1.0:
+yarn-deduplicate@^1.1.1:
-  version "1.1.0"
+  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-1.1.0.tgz#bdfdcc5a2473556c0232996424dfe039293f2f44"
+  resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-1.1.1.tgz#19b4a87654b66f55bf3a4bd6b153b4e4ab1b6e6d"
-  integrity sha512-YTZzmzzUgDK7IllsKxgnTQ7zAGbTVnj3bnH3nxoqZ2dE0IY7NpaFpFYXR+BuBeDtxIgMhwJJvH1LTWm3k3fWpg==
+  integrity sha512-2FDJ1dFmtvqhRmfja89ohYzpaheCYg7BFBSyaUq+kxK0y61C9oHv1XaQovCWGJtP2WU8PksQOgzMVV7oQOobzw==
  dependencies:
    "@yarnpkg/lockfile" "^1.1.0"
    commander "^2.10.0"