root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 90 Packages Projects Releases Wiki Activity

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

This commit is contained in:
Torkel Ödegaard 2015-09-13 12:13:47 +02:00
parent 9db6f82628
commit 1900c81d9f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
circle.yml
View File

@ -1,4 +1,6 @@
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"

4
package.json
View File

@ -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",

2
public/app/features/dashboard/timepicker/timepicker.ts
View File

@ -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() {
}
}; };
} }