Skip to content

Commit

Permalink
Merge pull request #6634 from elastic/jasper/backport/6632/6632/4.x
Browse files Browse the repository at this point in the history
[backport] PR #6632 to 4.x
  • Loading branch information
epixa committed Mar 24, 2016
2 parents e291e10 + 858bfd7 commit 2be8934
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@
"karma-chrome-launcher": "0.2.0",
"karma-coverage": "0.5.1",
"karma-firefox-launcher": "0.1.6",
"karma-growl-reporter": "0.1.1",
"karma-ie-launcher": "0.2.0",
"karma-mocha": "0.2.0",
"karma-safari-launcher": "0.1.1",
Expand Down
2 changes: 1 addition & 1 deletion tasks/config/karma.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = function (grunt) {
browsers: ['<%= karmaBrowser %>'],

// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: process.env.CI ? ['dots'] : ['progress', 'growl'],
reporters: process.env.CI ? ['dots'] : ['progress'],

// list of files / patterns to load in the browser
files: [
Expand Down

0 comments on commit 2be8934

Please sign in to comment.