diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ca155645f..42de0b887c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ CHANGELOG * @BrandonOCasey removed unused base-styles.js file ([view](https://github.com/videojs/video.js/pull/3486)) * @erikyuzwa, @gkatsev updated CSS build to inlcude the IE8-specific CSS from a separate file instead of it being inside of sass ([view](https://github.com/videojs/video.js/pull/3380)) ([view2](https://github.com/erikyuzwa/video.js/pull/1)) * @gkatsev added null checks around navigator.userAgent ([view](https://github.com/videojs/video.js/pull/3502)) +* greenkeeper updated karma dependencies ([view](https://github.com/videojs/video.js/pull/3523)) -------------------- diff --git a/package.json b/package.json index 7f2d697441..f249289a70 100644 --- a/package.json +++ b/package.json @@ -66,23 +66,23 @@ "grunt-exorcise": "^1.0.1", "grunt-fastly": "^0.1.3", "grunt-github-releaser": "^0.1.17", - "grunt-karma": "^0.8.3", + "grunt-karma": "^2.0.0", "grunt-shell": "^1.3.0", "grunt-version": "~0.3.0", "grunt-videojs-languages": "0.0.4", "grunt-zip": "0.10.2", - "karma": "^0.12.36", - "karma-browserify": "^4.0.0", - "karma-browserstack-launcher": "^0.1.4", - "karma-chrome-launcher": "^0.1.3", - "karma-coverage": "^0.4.0", - "karma-detect-browsers": "^2.0.2", - "karma-firefox-launcher": "^0.1.3", - "karma-ie-launcher": "^0.1.5", - "karma-opera-launcher": "~0.1.0", - "karma-qunit": "^0.1.2", - "karma-safari-launcher": "^0.1.1", - "karma-sinon": "^1.0.3", + "karma": "^1.2.0", + "karma-browserify": "^5.1.0", + "karma-browserstack-launcher": "^1.0.1", + "karma-chrome-launcher": "^1.0.1", + "karma-coverage": "^1.1.1", + "karma-detect-browsers": "^2.1.0", + "karma-firefox-launcher": "^1.0.0", + "karma-ie-launcher": "^1.0.0", + "karma-opera-launcher": "^1.0.0", + "karma-qunit": "^1.2.0", + "karma-safari-launcher": "^1.0.0", + "karma-sinon": "^1.0.5", "load-grunt-tasks": "^3.1.0", "proxyquireify": "^3.0.0", "qunitjs": "^1.18.0",