From 1900c81d9f9507ed4dbd18e95569480dfd0922f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 13 Sep 2015 12:13:47 +0200 Subject: [PATCH] tech(nodejs upgrade): upgraded to nodejs 4.0 for grunt build --- circle.yml | 2 ++ package.json | 4 ++-- public/app/features/dashboard/timepicker/timepicker.ts | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 32ace393c8b..bb22fcb0a6e 100644 --- a/circle.yml +++ b/circle.yml @@ -1,4 +1,6 @@ machine: + node: + version: 4.0 environment: GOPATH: "/home/ubuntu/.go_workspace" ORG_PATH: "github.com/grafana" diff --git a/package.json b/package.json index 656ccd5e989..9411aece50c 100644 --- a/package.json +++ b/package.json @@ -53,8 +53,8 @@ "tslint": "^2.5.0-beta" }, "engines": { - "node": "0.10.x", - "npm": "1.2.x" + "node": "0.4.x", + "npm": "2.14.x" }, "scripts": { "test": "grunt test", diff --git a/public/app/features/dashboard/timepicker/timepicker.ts b/public/app/features/dashboard/timepicker/timepicker.ts index e16f0a6090d..217d92d73df 100644 --- a/public/app/features/dashboard/timepicker/timepicker.ts +++ b/public/app/features/dashboard/timepicker/timepicker.ts @@ -202,8 +202,6 @@ export function settingsDirective() { templateUrl: 'app/features/dashboard/timepicker/settings.html', controller: TimePickerCtrl, scope: true, - link: function() { - } }; }