summaryrefslogtreecommitdiff
path: root/yarn.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-08-17 14:01:31 +0200
committerDouwe Maan <douwe@selenight.nl>2017-08-17 14:01:31 +0200
commit834f1b30d50dc3ad9d0f6ff81cef24dc6ebc375c (patch)
treee5f2e714e695d995649942111f29d4e857b33a67 /yarn.lock
parent6aeb99c98bee304c5010a1173c47777eff1e04a5 (diff)
parentfe0ffcc78941bf9de98e3698e743c3cbb9846b6a (diff)
downloadgitlab-ce-834f1b30d50dc3ad9d0f6ff81cef24dc6ebc375c.tar.gz
Merge branch 'master' into issue-discussions-refactor
# Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb
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 64c932b7ff5..ca6066dc14d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6279,9 +6279,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"