diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-04-18 02:08:26 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-04-18 02:08:26 +0300 |
| commit | ce02daea08c4cc7bc5e65e56f9b3d744a2e1faa6 (patch) | |
| tree | cd45b54442bf5bca34b04971df135ba68df583a4 /app/controllers | |
| parent | a6a1afe070ffe4fa66b5ace9d35ca8c6ee481986 (diff) | |
| parent | 761fa974706c39804f869da7209661f4845b219f (diff) | |
Merge branch 'jivl-add-feature-flag-gon-ee' into 'master'
make the monitoring bundle reusable
See merge request gitlab-org/gitlab-ce!27402
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/clusters/clusters_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb index e82756e4643..edaf07063ec 100644 --- a/app/controllers/clusters/clusters_controller.rb +++ b/app/controllers/clusters/clusters_controller.rb @@ -12,6 +12,9 @@ class Clusters::ClustersController < Clusters::BaseController before_action :authorize_update_cluster!, only: [:update] before_action :authorize_admin_cluster!, only: [:destroy] before_action :update_applications_status, only: [:cluster_status] + before_action only: [:show] do + push_frontend_feature_flag(:metrics_time_window) + end helper_method :token_in_session |