summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-06-23 13:31:44 -0400
committerJacob Schatz <jschatz1@gmail.com>2017-06-23 13:31:44 -0400
commitd04f4a9b65e2dc3fb229ee3429e6988216552c46 (patch)
tree08daa00e770b0c2191cdb01f695223dd5c37a8a3 /package.json
parentd38e52fb86815df11de1b66a689caa19fa812b8c (diff)
parent134ba0b5cb3e5bb6002595aed615bea9205807c2 (diff)
downloadgitlab-ce-d04f4a9b65e2dc3fb229ee3429e6988216552c46.tar.gz
Merge branch 'dm-tree-json' into ide Resolving conflicts.
Diffstat (limited to 'package.json')
-rw-r--r--package.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json
index 26407cff9ab..39d715816c1 100644
--- a/package.json
+++ b/package.json
@@ -74,13 +74,13 @@
"eslint-plugin-jasmine": "^2.1.0",
"eslint-plugin-promise": "^3.5.0",
"istanbul": "^0.4.5",
- "jasmine-core": "^2.5.2",
+ "jasmine-core": "^2.6.3",
"jasmine-jquery": "^2.1.1",
- "karma": "^1.4.1",
+ "karma": "^1.7.0",
+ "karma-chrome-launcher": "^2.1.1",
"karma-coverage-istanbul-reporter": "^0.2.0",
"karma-jasmine": "^1.1.0",
"karma-mocha-reporter": "^2.2.2",
- "karma-phantomjs-launcher": "^1.0.2",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.2",
"nodemon": "^1.11.0",