diff --git a/package.json b/package.json index f47a59799e3..530a3ea95f2 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "grunt-sass": "^1.1.0", "grunt-string-replace": "~1.2.1", "grunt-systemjs-builder": "^0.2.5", - "grunt-tslint": "^3.0.1", + "grunt-tslint": "^3.0.2", "grunt-typescript": "^0.8.0", "grunt-usemin": "3.0.0", "jshint-stylish": "~0.1.5", @@ -74,7 +74,7 @@ "lodash": "^2.4.1", "sinon": "1.16.1", "systemjs-builder": "^0.15.7", - "tslint": "^3.2.1", + "tslint": "^3.4.0", "typescript": "^1.7.5" } } diff --git a/pkg/api/index.go b/pkg/api/index.go index e595eabd790..b53050c9833 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -110,7 +110,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { {Text: "Global Orgs", Icon: "fa fa-fw fa-cogs", Url: setting.AppSubUrl + "/admin/orgs"}, {Text: "Server Settings", Icon: "fa fa-fw fa-cogs", Url: setting.AppSubUrl + "/admin/settings"}, {Text: "Server Stats", Icon: "fa-fw fa-cogs", Url: setting.AppSubUrl + "/admin/stats"}, - }, + }, }) } diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html index 66ee0b6d8b9..61785b3cfe3 100644 --- a/public/app/core/components/sidemenu/sidemenu.html +++ b/public/app/core/components/sidemenu/sidemenu.html @@ -3,8 +3,10 @@