diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-03-07 19:35:42 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-03-07 19:35:42 +0000 |
| commit | 405ce60bfc023414552939c440f082ed9ea70e39 (patch) | |
| tree | ec2e27c9c382a4a797f7eb3cb67a077af7ef2a24 | |
| parent | dd930faea663ec387c09141fcad943bb5daf503b (diff) | |
| parent | f8a96df86e676dd83b4296751a9af3d56a0fb5c2 (diff) | |
| download | gitlab-ce-405ce60bfc023414552939c440f082ed9ea70e39.tar.gz | |
Merge branch 'mg-fix-yarn-deduplicate' into 'master'
Fix "yarn-deduplicate has unmet dependencies"
See merge request gitlab-org/gitlab-ce!25885
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package.json b/package.json index d295e93ccaa..7cdb11dca14 100644 --- 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" diff --git a/yarn.lock b/yarn.lock index 48bd87e0ee6..1ac6b322469 100644 --- 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: - version "1.1.0" - resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-1.1.0.tgz#bdfdcc5a2473556c0232996424dfe039293f2f44" - integrity sha512-YTZzmzzUgDK7IllsKxgnTQ7zAGbTVnj3bnH3nxoqZ2dE0IY7NpaFpFYXR+BuBeDtxIgMhwJJvH1LTWm3k3fWpg== +yarn-deduplicate@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-1.1.1.tgz#19b4a87654b66f55bf3a4bd6b153b4e4ab1b6e6d" + integrity sha512-2FDJ1dFmtvqhRmfja89ohYzpaheCYg7BFBSyaUq+kxK0y61C9oHv1XaQovCWGJtP2WU8PksQOgzMVV7oQOobzw== dependencies: "@yarnpkg/lockfile" "^1.1.0" commander "^2.10.0" |