Commit 1900c81d by Torkel Ödegaard

tech(nodejs upgrade): upgraded to nodejs 4.0 for grunt build

parent 9db6f826
machine: machine:
node:
version: 4.0
environment: environment:
GOPATH: "/home/ubuntu/.go_workspace" GOPATH: "/home/ubuntu/.go_workspace"
ORG_PATH: "github.com/grafana" ORG_PATH: "github.com/grafana"
......
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
"tslint": "^2.5.0-beta" "tslint": "^2.5.0-beta"
}, },
"engines": { "engines": {
"node": "0.10.x", "node": "0.4.x",
"npm": "1.2.x" "npm": "2.14.x"
}, },
"scripts": { "scripts": {
"test": "grunt test", "test": "grunt test",
......
...@@ -202,8 +202,6 @@ export function settingsDirective() { ...@@ -202,8 +202,6 @@ export function settingsDirective() {
templateUrl: 'app/features/dashboard/timepicker/settings.html', templateUrl: 'app/features/dashboard/timepicker/settings.html',
controller: TimePickerCtrl, controller: TimePickerCtrl,
scope: true, scope: true,
link: function() {
}
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment