Merge branch '13739/alert-to-react'

This commit is contained in:
Torkel Ödegaard
2018-10-25 17:44:23 +02:00
20 changed files with 313 additions and 131 deletions

View File

@@ -17,7 +17,6 @@ export class GrafanaCtrl {
/** @ngInject */
constructor(
$scope,
alertSrv,
utilSrv,
$rootScope,
$controller,
@@ -41,11 +40,8 @@ export class GrafanaCtrl {
$scope._ = _;
profiler.init(config, $rootScope);
alertSrv.init();
utilSrv.init();
bridgeSrv.init();
$scope.dashAlerts = alertSrv;
};
$rootScope.colors = colors;