IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'alerting' of github.com:grafana/grafana into alerting

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-08-12 10:32:58 +02:00
parent 06210a4a22 1dcae464fe
commit 597103a1f2
14 changed files with 33 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/features/alerting/alert_tab_ctrl.ts
View File

@@ -111,7 +111,6 @@ export class AlertTabCtrl {
var defaultName = this.panel.title + ' alert';
alert.name = alert.name || defaultName;
alert.description = alert.description || defaultName;
this.conditionModels = _.reduce(alert.conditions, (memo, value) => {
memo.push(this.buildConditionModel(value));