Commit 40a9d054 authored by Mike Greiling's avatar Mike Greiling

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
parents 7d47ec54 b78c370a
...@@ -4,6 +4,10 @@ class Projects::ClustersController < Clusters::ClustersController ...@@ -4,6 +4,10 @@ class Projects::ClustersController < Clusters::ClustersController
prepend_before_action :project prepend_before_action :project
before_action :repository before_action :repository
before_action do
push_frontend_feature_flag(:prometheus_computed_alerts)
end
layout 'project' layout 'project'
private private
......
...@@ -15,6 +15,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -15,6 +15,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint) push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint)
push_frontend_feature_flag(:environment_metrics_show_multiple_dashboards) push_frontend_feature_flag(:environment_metrics_show_multiple_dashboards)
push_frontend_feature_flag(:grafana_dashboard_link) push_frontend_feature_flag(:grafana_dashboard_link)
push_frontend_feature_flag(:prometheus_computed_alerts)
end end
def index def index
......
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