summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-02-08 15:59:41 -0600
committerMike Greiling <mike@pixelcog.com>2017-02-09 10:52:19 -0600
commit0d60fa8dc52662923a645ac3ab278b172188b1a4 (patch)
tree5897a452f9621d408247e51ccc295fc16f658211
parent6dd90100bde153a62998f8db2204e4f59bca7940 (diff)
downloadgitlab-ce-0d60fa8dc52662923a645ac3ab278b172188b1a4.tar.gz
update karma deps to work with webpack 2
-rw-r--r--package.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json
index a012c49a72d..249c69f586a 100644
--- a/package.json
+++ b/package.json
@@ -42,10 +42,10 @@
"istanbul": "^0.4.5",
"jasmine-core": "^2.5.2",
"jasmine-jquery": "^2.1.1",
- "karma": "^1.3.0",
+ "karma": "^1.4.1",
"karma-jasmine": "^1.1.0",
"karma-phantomjs-launcher": "^1.0.2",
"karma-sourcemap-loader": "^0.3.7",
- "karma-webpack": "^1.8.0"
+ "karma-webpack": "^2.0.2"
}
}