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

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
3b4c4095 · Filipa Lacerda · 03f16db0 · 9aaa0919 · 3b4c4095
Commit 3b4c4095 authored Feb 06, 2019 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

app/views/projects/services/prometheus/_show.html.haml app/views/projects/services/prometheus/_show.html.haml +2 -0

No files found.
--- a/app/views/projects/services/prometheus/_show.html.haml
+++ b/app/views/projects/services/prometheus/_show.html.haml
@@ -8,3 +8,5 @@

  .col-lg-9
    = render 'projects/services/prometheus/metrics', project: @project
+
+= render_if_exists 'projects/services/prometheus/external_alerts', project: @project