Merge branch 'master' into alerting_reminder

* master: (30 commits)
  changelog: add notes about closing #11882
  renamed variable in tests
  added comment, variableChange -> variableValueChange
  added a test
  added if to check if new variable has been added
  Gravatar fallback does not respect 'AppSubUrl'-setting (#12149)
  change admin password after first login
  changelog: adds note about closing #11958
  revert: reverted singlestat panel position change PR #12004
  Revert "provisioning: turn relative symlinked path into absolut paths"
  provisioning: turn relative symlinked path into absolut paths
  changelog: adds note about closing #11670
  elasticsearch: sort bucket keys to fix issue wth response parser tests
  docs: what's new in v5.2
  changelog: add notes about closing #11167
  docs: docker secrets support. (#12141)
  alerting: show alerts for user with Viewer role
  datasource: added option no-direct-access to ds-http-settings diretive, closes #12138
  provisioning: adds fallback if evalsymlink/abs fails
  tests: uses different paths depending on os
  ...

This commit is contained in:

bergquist

2018-06-04 17:44:18 +02:00

parent 86e65f84f9 95aef8241c

commit 0e647db485

41 changed files with 605 additions and 165 deletions

									
										pkg/services/sqlstore/migrations/dashboard_mig.go
									
		+4
		
												View File
												
				@@ -211,4 +211,8 @@ func addDashboardMigration(mg *Migrator) {

						"name":         "name",

						"external_id":  "external_id",

					})

					mg.AddMigration("Add check_sum column", NewAddColumnMigration(dashboardExtrasTableV2, &Column{

						Name: "check_sum", Type: DB_NVarchar, Length: 32, Nullable: true,

					}))

				}