summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-01-09 10:59:30 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-01-09 10:59:30 +0000
commit4f6620a5ae00383a015379f95408ed7f1be1bdbb (patch)
tree27b8efb817693ba907f243fea67fcdaa920ffab6 /package.json
parent7108952df6d80c25dc989be64b1642668fe4cc67 (diff)
parentbca9b6fafb0c4fb019e493d43ba96ec0636ba40f (diff)
downloadgitlab-ce-4f6620a5ae00383a015379f95408ed7f1be1bdbb.tar.gz
Merge branch 'tz-upgrade-vue' into 'master'
Upgraded Vue and related libraries See merge request gitlab-org/gitlab-ce!24159
Diffstat (limited to 'package.json')
-rw-r--r--package.json12
1 files changed, 6 insertions, 6 deletions
diff --git a/package.json b/package.json
index 5c4abacae99..be8568f89f0 100644
--- a/package.json
+++ b/package.json
@@ -102,12 +102,12 @@
"underscore": "^1.9.0",
"url-loader": "^1.1.1",
"visibilityjs": "^1.2.4",
- "vue": "^2.5.17",
+ "vue": "^2.5.21",
"vue-apollo": "^3.0.0-beta.25",
- "vue-loader": "^15.4.2",
- "vue-resource": "^1.5.0",
- "vue-router": "^3.0.1",
- "vue-template-compiler": "^2.5.17",
+ "vue-loader": "^15.5.0",
+ "vue-resource": "^1.5.1",
+ "vue-router": "^3.0.2",
+ "vue-template-compiler": "^2.5.21",
"vue-virtual-scroll-list": "^1.2.5",
"vuex": "^3.0.1",
"webpack": "^4.19.1",
@@ -157,7 +157,7 @@
"karma-webpack": "^4.0.0-beta.0",
"nodemon": "^1.18.4",
"prettier": "1.15.2",
- "vue-jest": "^3.0.1",
+ "vue-jest": "^3.0.2",
"webpack-dev-server": "^3.1.10",
"yarn-deduplicate": "^1.0.5"
},