summaryrefslogtreecommitdiff
path: root/yarn.lock
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-08-15 14:13:06 -0300
committerMarcia Ramos <virtua.creative@gmail.com>2017-08-15 14:13:06 -0300
commitb4e0be609593524e66db5e1ea1df066fa8f180f9 (patch)
tree168f5796cf5bc2860f3ac4f1333bd2d1e5e7c12e /yarn.lock
parent06785f92a13f9f722515cc2363569437c9ccd339 (diff)
parent05151f7699ee2adf67ce835413dfdbd80c58a3e5 (diff)
downloadgitlab-ce-b4e0be609593524e66db5e1ea1df066fa8f180f9.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 33329-tech-article-deploying-maven-artifacts
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/yarn.lock b/yarn.lock
index c9e1b630a9e..5fc28f8b5ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6275,9 +6275,9 @@ webpack-stats-plugin@^0.1.5:
version "0.1.5"
resolved "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-0.1.5.tgz#29e5f12ebfd53158d31d656a113ac1f7b86179d9"
-webpack@^3.4.0:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.4.0.tgz#e9465b660ad79dd2d33874d968b31746ea9a8e63"
+webpack@^3.5.4:
+ version "3.5.4"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.4.tgz#5583eb263ed27b78b5bd17bfdfb0eb1b1cd1bf81"
dependencies:
acorn "^5.0.0"
acorn-dynamic-import "^2.0.0"