diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 21:09:32 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 21:09:32 +0300 |
commit | ed5add1c2f001c9bd54e664b32f212de172eca6a (patch) | |
tree | f9449cbecde36706f25a62f426b5398566ae5cca /spec/models | |
parent | de2fb5b82c92c90f90ed67ced45143c04e934fb8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/prometheus_alert_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/models/prometheus_alert_spec.rb b/spec/models/prometheus_alert_spec.rb index cdcdb46a6c4..1409cf65fee 100644 --- a/spec/models/prometheus_alert_spec.rb +++ b/spec/models/prometheus_alert_spec.rb @@ -96,7 +96,8 @@ describe PrometheusAlert do "for" => "5m", "labels" => { "gitlab" => "hook", - "gitlab_alert_id" => metric.id + "gitlab_alert_id" => metric.id, + "gitlab_prometheus_alert_id" => subject.id }) end end |