Merge branch 'mg-fix-yarn-deduplicate' into 'master'
Fix "yarn-deduplicate has unmet dependencies" See merge request gitlab-org/gitlab-ce!25885
Showing
... | @@ -175,7 +175,7 @@ | ... | @@ -175,7 +175,7 @@ |
"stylelint-scss": "^3.5.3", | "stylelint-scss": "^3.5.3", | ||
"vue-jest": "^4.0.0-beta.2", | "vue-jest": "^4.0.0-beta.2", | ||
"webpack-dev-server": "^3.1.14", | "webpack-dev-server": "^3.1.14", | ||
"yarn-deduplicate": "^1.1.0" | "yarn-deduplicate": "^1.1.1" | ||
}, | }, | ||
"resolutions": { | "resolutions": { | ||
"vue-jest/ts-jest": "24.0.0" | "vue-jest/ts-jest": "24.0.0" | ||
... | ... |
Please register or sign in to comment