diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-07 10:57:35 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-07 10:57:35 +0100 |
| commit | eb9632aab2f027393ab34158453114fd281e4d55 (patch) | |
| tree | e9047cb60db1092a1e1a0cdf1c9759b3bb753156 /app/controllers/projects/clusters_controller.rb | |
| parent | 399085d6f5f0bbbd61f1286a93e76aa2371f9143 (diff) | |
| parent | fd19f887dfeeeedb483c4a4fb32f9f768e89389c (diff) | |
| download | gitlab-ce-62788-graphql-pagination.tar.gz | |
Merge branch 'master' into 62788-graphql-pagination62788-graphql-pagination
* master: (61 commits)
Add dependency list documentation
added code differences from EE to CE
Remove metrics_time_window feature flag
SSoT audit fixes
Integrate demo link into content more
Add styles and animations for onboarding helper
Add git 2.21 install from update_source
IDE trigger files change event
Remove 'build-page' from 'ide-terminal' element
Add section to dev docs on accessing chatops
Fix OpenID Connect documentation
Make OpenID Connect work without requiring a name
Apply reviewer feedback
Change text to match screencaps
Reword for clarity
Upgrade jira user permissions workflow docs
Fix some typoes
Removes duplicated shared_context folder
Add frontend support for cluster health alerts
Add changelog entry for sidekiq metrics
...
Diffstat (limited to 'app/controllers/projects/clusters_controller.rb')
| -rw-r--r-- | app/controllers/projects/clusters_controller.rb | 4 |
1 files changed, 4 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 |