From 05f23ccf40aa8d85a1811cbf9d6009f20cb0442e Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sun, 31 May 2015 18:10:24 +0000 Subject: Update to 2.0.2 / b51a8f11d5 --- www/grafana2/files/patch-package.json | 7 ++----- www/grafana2/files/patch-tasks_build__task.js | 10 ++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 www/grafana2/files/patch-tasks_build__task.js (limited to 'www/grafana2/files') diff --git a/www/grafana2/files/patch-package.json b/www/grafana2/files/patch-package.json index dd1ba71..83de805 100644 --- a/www/grafana2/files/patch-package.json +++ b/www/grafana2/files/patch-package.json @@ -1,7 +1,4 @@ -karma-phantomjs-launcher depends on npmjs package 'phantomjs' which -deliberately downloads big phantomjs binary that we don't need/want. - ---- package.json.orig 2015-05-03 16:30:35 UTC +--- package.json.orig 2015-05-29 06:22:46 UTC +++ package.json @@ -35,15 +35,6 @@ "grunt-usemin": "3.0.0", @@ -12,7 +9,7 @@ deliberately downloads big phantomjs binary that we don't need/want. - "karma-coverage": "0.3.1", - "karma-coveralls": "0.1.5", - "karma-expect": "~1.1.0", -- "karma-mocha": "~0.1.4", +- "karma-mocha": "~0.1.10", - "karma-phantomjs-launcher": "0.1.4", - "karma-requirejs": "0.2.2", - "karma-script-launcher": "0.1.0", diff --git a/www/grafana2/files/patch-tasks_build__task.js b/www/grafana2/files/patch-tasks_build__task.js new file mode 100644 index 0000000..52a7581 --- /dev/null +++ b/www/grafana2/files/patch-tasks_build__task.js @@ -0,0 +1,10 @@ +--- tasks/build_task.js.orig 2015-05-31 16:02:12 UTC ++++ tasks/build_task.js +@@ -6,7 +6,6 @@ module.exports = function(grunt) { + 'jshint:source', + 'jshint:tests', + 'jscs', +- 'karma:test', + 'clean:on_start', + 'less:src', + 'concat:cssDark', -- cgit v1.2.1