From e3a35bd2ff3a8c69ffa2a6c1c51d2d5cc6d09988 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 26 May 2022 07:41:03 -0400 Subject: [PATCH] Remove migrations from behind configs (#49415) (#49684) --- pkg/services/sqlstore/migrations/migrations.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go index facb4b8225d..52a331415fc 100644 --- a/pkg/services/sqlstore/migrations/migrations.go +++ b/pkg/services/sqlstore/migrations/migrations.go @@ -76,13 +76,10 @@ func (*OSSMigrations) AddMigration(mg *Migrator) { accesscontrol.AddMigration(mg) addQueryHistoryMigrations(mg) - if mg.Cfg != nil && mg.Cfg.IsFeatureToggleEnabled != nil { - if mg.Cfg.RBACEnabled { - accesscontrol.AddTeamMembershipMigrations(mg) - accesscontrol.AddDashboardPermissionsMigrator(mg) - accesscontrol.AddAlertingPermissionsMigrator(mg) - } - } + accesscontrol.AddTeamMembershipMigrations(mg) + accesscontrol.AddDashboardPermissionsMigrator(mg) + accesscontrol.AddAlertingPermissionsMigrator(mg) + addQueryHistoryStarMigrations(mg) if mg.Cfg != nil && mg.Cfg.IsFeatureToggleEnabled != nil {