Merge branch 'master' into 9587_annotation_tags_wih_temp_var

* master:
  fix theme parameter not working problem while prefer theme set to light (#13232)
  fix: added type export to fix failing test
  fix: fixed typescript test error
  another circleci fix
  Another circleci fix
  changed gometalinter to use github master
  commented out metalinter as gopkg is having issues
  Fix prometheus label filtering for comparison queries (#13213)
  Upgrade react and enzyme (#13224)
  Teams page replace mobx (#13219)
  upgrade of typescript and tslint and jest (#13223)
  fix nil pointer dereference (#13221)
This commit is contained in:
bergquist
2018-09-12 09:23:54 +02:00
56 changed files with 4162 additions and 2207 deletions
+3
View File
@@ -91,6 +91,9 @@ func setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, error) {
if themeURLParam == "light" {
data.User.LightTheme = true
data.Theme = "light"
} else if themeURLParam == "dark" {
data.User.LightTheme = false
data.Theme = "dark"
}
if hasEditPermissionInFoldersQuery.Result {