From 1ca4ecc241b62b0586b25bfeeddfb1e6f1bf47ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 3 Feb 2015 13:05:14 +0100
Subject: [PATCH 1/2] Updated grunt-jscs dependency version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ba7a4c9324a..becdac0ae23 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
   },
   "license": "Apache License",
   "dependencies": {
-    "grunt-jscs-checker": "^0.4.4",
+    "grunt-jscs": "^0.8.1",
     "karma-sinon": "^1.0.3",
     "sinon": "^1.10.3"
   }

From 858d7be8cf0ab32137d069a0c541155045b1271b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 3 Feb 2015 13:36:04 +0100
Subject: [PATCH 2/2] Migrated from ngmin to ngAnnotate

---
 package.json                              | 3 ++-
 tasks/build_task.js                       | 2 +-
 tasks/options/{ngmin.js => ngAnnotate.js} | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename tasks/options/{ngmin.js => ngAnnotate.js} (95%)

diff --git a/package.json b/package.json
index becdac0ae23..054aa61d717 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "grunt-filerev": "^0.2.1",
     "grunt-git-describe": "~2.3.2",
     "grunt-karma": "~0.8.3",
+    "grunt-ng-annotate": "^0.9.2",
     "grunt-ngmin": "0.0.3",
     "grunt-string-replace": "~0.2.4",
     "grunt-usemin": "^2.1.1",
@@ -44,7 +45,7 @@
     "karma-html2js-preprocessor": "~0.1.0",
     "karma-jasmine": "~0.2.2",
     "karma-mocha": "~0.1.4",
-    "karma-phantomjs-launcher": "~0.1.1",
+    "karma-phantomjs-launcher": "~0.1.4",
     "karma-requirejs": "~0.2.1",
     "karma-script-launcher": "~0.1.0",
     "load-grunt-tasks": "~0.2.0",
diff --git a/tasks/build_task.js b/tasks/build_task.js
index 4b576b0c0c3..6802f65fd3f 100644
--- a/tasks/build_task.js
+++ b/tasks/build_task.js
@@ -14,7 +14,7 @@ module.exports = function(grunt) {
     'ngtemplates',
     'cssmin:build',
     'build:grafanaVersion',
-    'ngmin:build',
+    'ngAnnotate:build',
     'requirejs:build',
     'concat:js',
     'filerev',
diff --git a/tasks/options/ngmin.js b/tasks/options/ngAnnotate.js
similarity index 95%
rename from tasks/options/ngmin.js
rename to tasks/options/ngAnnotate.js
index 1a25ebee279..e0fd2dba7c9 100644
--- a/tasks/options/ngmin.js
+++ b/tasks/options/ngAnnotate.js
@@ -1,7 +1,7 @@
 module.exports = function(config) {
   return {
     build: {
-      expand:true,
+      expand: true,
       cwd:'<%= tempDir %>',
       src: [
         'app/controllers/**/*.js',