summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-07-20 17:34:04 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-07-20 17:51:07 +0100
commit6448368b5b71d9c93b865d2cad0206b475db4553 (patch)
treeac26a315400e40ceba27eb37cadef461f2d77e54 /package.json
parent115ffa3749300b58d7161610e27a41b844b3fb80 (diff)
parent7f78a78a36a4341680a71afa5a12a1f4d4876c66 (diff)
downloadgitlab-ce-6448368b5b71d9c93b865d2cad0206b475db4553.tar.gz
Merge remote-tracking branch 'origin/master' into ide
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 16497ba0ea5..d1f2b356423 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
"dependencies": {
"axios": "^0.16.2",
"babel-core": "^6.22.1",
+ "babel-eslint": "^7.2.1",
"babel-loader": "^6.2.10",
"babel-plugin-transform-define": "^1.2.0",
"babel-preset-latest": "^6.24.0",
@@ -61,7 +62,7 @@
"visibilityjs": "^1.2.4",
"vue": "^2.2.6",
"vue-loader": "^11.3.4",
- "vue-resource": "^0.9.3",
+ "vue-resource": "^1.3.4",
"vue-template-compiler": "^2.2.6",
"webpack": "^2.6.1",
"webpack-bundle-analyzer": "^2.8.2"