summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-11-02 09:29:19 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-11-02 09:29:19 +0000
commit78dc77781612fe31f3506fd6a9bf537ed8c7dc9f (patch)
tree3485b0e262e655f6d2dfeb05e7090e5c74e1ad0e /package.json
parent3c03388ba047d073bd6585a201f6e56060676dcf (diff)
parentb20381204ad84069677a53bff1cbe728745c38db (diff)
downloadgitlab-ce-78dc77781612fe31f3506fd6a9bf537ed8c7dc9f.tar.gz
Merge branch 'vue-update' into 'master'
Updated Vue to 2.5.1 See merge request gitlab-org/gitlab-ce!14874
Diffstat (limited to 'package.json')
-rw-r--r--package.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json
index 0a1f5c8d081..e607981143d 100644
--- a/package.json
+++ b/package.json
@@ -64,10 +64,10 @@
"underscore": "^1.8.3",
"url-loader": "^0.5.8",
"visibilityjs": "^1.2.4",
- "vue": "^2.2.6",
+ "vue": "^2.5.2",
"vue-loader": "^11.3.4",
"vue-resource": "^1.3.4",
- "vue-template-compiler": "^2.2.6",
+ "vue-template-compiler": "^2.5.2",
"vuex": "^3.0.0",
"webpack": "^3.5.5",
"webpack-bundle-analyzer": "^2.8.2",