summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorMike Greiling <mgreiling@gitlab.com>2017-06-13 15:20:26 +0000
committerMike Greiling <mgreiling@gitlab.com>2017-06-13 15:20:26 +0000
commita526e619d96aa95a55110e540363c34ab782defc (patch)
tree09e41597fac96b94bcf2f7423811d34ca4997d92 /package.json
parentf79caeaa454473802fe648f142bcf73684ffdbdc (diff)
downloadgitlab-ce-a526e619d96aa95a55110e540363c34ab782defc.tar.gz
Revert "Merge branch 'karma-headless-chrome' into 'master'"
This reverts merge request !12036
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json
index 7c8c2a00e1e..29165fd4182 100644
--- a/package.json
+++ b/package.json
@@ -75,10 +75,10 @@
"jasmine-core": "^2.5.2",
"jasmine-jquery": "^2.1.1",
"karma": "^1.4.1",
- "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",