diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-06-06 19:57:29 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-06-06 19:57:29 +0000 |
| commit | 40a9d05464960bfdef2612e2b6e4c5c2752d4663 (patch) | |
| tree | e6925450c16ea71729b6a213e96e55fbdfe98d9a | |
| parent | 7d47ec540d3e730a1d98deb37355253720b8c98b (diff) | |
| parent | b78c370ac56da396ecdd091319d2610ea2768dd7 (diff) | |
| download | gitlab-ce-40a9d05464960bfdef2612e2b6e4c5c2752d4663.tar.gz | |
Merge branch 'ce-5456-add-cluster-health-alert-frontend' into 'master'
Backport: Add frontend support for cluster health alerts
See merge request gitlab-org/gitlab-ce!29075
| -rw-r--r-- | app/controllers/projects/clusters_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/projects/environments_controller.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index cb02581da37..98cd66cf6f9 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -4,6 +4,10 @@ class Projects::ClustersController < Clusters::ClustersController prepend_before_action :project before_action :repository + before_action do + push_frontend_feature_flag(:prometheus_computed_alerts) + end + layout 'project' private diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index c342e1c80b0..681b49e0bd7 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -15,6 +15,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint) push_frontend_feature_flag(:environment_metrics_show_multiple_dashboards) push_frontend_feature_flag(:grafana_dashboard_link) + push_frontend_feature_flag(:prometheus_computed_alerts) end def index |