diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-02-06 12:13:32 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-02-06 12:13:32 +0000 |
| commit | 3b4c4095bbda55ae0b4d32f9b17c0e4f03c5ceed (patch) | |
| tree | 1544fdd45fa0f71a1033e4a99cf5c0e3c5be91aa | |
| parent | 03f16db049c0440b07c26189626971c2573c1300 (diff) | |
| parent | 9aaa0919294ebcfdd2c1a1fd5caf292c7629e015 (diff) | |
| download | gitlab-ce-3b4c4095bbda55ae0b4d32f9b17c0e4f03c5ceed.tar.gz | |
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
| -rw-r--r-- | app/views/projects/services/prometheus/_show.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index 9d4574c4590..6aafa85e99a 100644 --- 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 |