summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-05-23 14:45:32 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-05-23 14:45:32 -0500
commit51d455d05bfbdba5fac62c799703bd50fe7d70e4 (patch)
treea886df6d419378607d4fdf10112f79914613ed32 /package.json
parentee16cf15baca0405b0db2db029c0538d8496864f (diff)
parent6c51e220ef2774447038a909c4f22ff90eb624fb (diff)
downloadgitlab-ce-51d455d05bfbdba5fac62c799703bd50fe7d70e4.tar.gz
Merge branch 'master' into bootstrap4
Diffstat (limited to 'package.json')
-rw-r--r--package.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/package.json b/package.json
index a0441e96fb5..000e165c5ad 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
"blackst0ne-mermaid": "^7.1.0-fixed",
"bootstrap": "4.1",
"brace-expansion": "^1.1.8",
+ "cache-loader": "^1.2.2",
"chart.js": "1.0.2",
"classlist-polyfill": "^1.2.0",
"clipboard": "^1.7.1",
@@ -85,7 +86,7 @@
"url-loader": "^1.0.1",
"visibilityjs": "^1.2.4",
"vue": "^2.5.16",
- "vue-loader": "^15.0.12",
+ "vue-loader": "^15.2.0",
"vue-resource": "^1.5.0",
"vue-router": "^3.0.1",
"vue-template-compiler": "^2.5.16",