Merge branch 'master' into alerting_definitions

2016-05-30 08:26:08 +02:00
parent e80000ce94 f8a535c6e8
commit 1686d86c3b
68 changed files with 768 additions and 219 deletions
@@ -1,13 +1,17 @@
 package dtos

 type IndexViewData struct {
-	User               *CurrentUser
-	Settings           map[string]interface{}
-	AppUrl             string
-	AppSubUrl          string
-	GoogleAnalyticsId  string
-	GoogleTagManagerId string
-	MainNavLinks       []*NavLink
+	User                    *CurrentUser
+	Settings                map[string]interface{}
+	AppUrl                  string
+	AppSubUrl               string
+	GoogleAnalyticsId       string
+	GoogleTagManagerId      string
+	MainNavLinks            []*NavLink
+	BuildVersion            string
+	BuildCommit             string
+	NewGrafanaVersionExists bool
+	NewGrafanaVersion       string
 }

 type PluginCss struct {