diff options
Diffstat (limited to 'app/controllers/clusters')
| -rw-r--r-- | app/controllers/clusters/base_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/clusters/clusters_controller.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/clusters/base_controller.rb b/app/controllers/clusters/base_controller.rb index 8c13cc67be2..6b83400971d 100644 --- a/app/controllers/clusters/base_controller.rb +++ b/app/controllers/clusters/base_controller.rb @@ -7,7 +7,7 @@ class Clusters::BaseController < ApplicationController before_action :authorize_read_cluster! before_action do - push_frontend_feature_flag(:managed_apps_local_tiller) + push_frontend_feature_flag(:managed_apps_local_tiller, clusterable) end helper_method :clusterable diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb index aa39d430b24..46dec5f3287 100644 --- a/app/controllers/clusters/clusters_controller.rb +++ b/app/controllers/clusters/clusters_controller.rb @@ -23,6 +23,7 @@ class Clusters::ClustersController < Clusters::BaseController respond_to do |format| format.html format.json do + Gitlab::PollingInterval.set_header(response, interval: STATUS_POLLING_INTERVAL) serializer = ClusterSerializer.new(current_user: current_user) render json: { |