Commit 3b4c4095 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'ee-9258-support-alerts-from-external-prometheus-servers-frontend' into 'master'

Backport for gitlab-ee!9239

See merge request gitlab-org/gitlab-ce!24818
parents 03f16db0 9aaa0919
...@@ -8,3 +8,5 @@ ...@@ -8,3 +8,5 @@
.col-lg-9 .col-lg-9
= render 'projects/services/prometheus/metrics', project: @project = render 'projects/services/prometheus/metrics', project: @project
= render_if_exists 'projects/services/prometheus/external_alerts', project: @project
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment