diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-05-31 12:28:48 +0300 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-05-31 12:28:48 +0300 |
| commit | d363014c36708864df09f39cb64415073a1430a0 (patch) | |
| tree | fbd3332dcf41a518c390b07d3bdcc7bef2cfdbec /app/controllers/projects/clusters_controller.rb | |
| parent | b4308842deb79c1364302188a41c6e37c14b62ec (diff) | |
| parent | 5b9edea9f16d57ef82f4a69eacd91c13d068583d (diff) | |
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
# Conflicts:
# app/controllers/projects/clusters/gcp_controller.rb
# app/views/projects/clusters/gcp/_form.html.haml
# app/views/projects/clusters/gcp/login.html.haml
Diffstat (limited to 'app/controllers/projects/clusters_controller.rb')
| -rw-r--r-- | app/controllers/projects/clusters_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index 03a1fe5aaec..1e8f3ac1433 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -9,6 +9,7 @@ class Projects::ClustersController < Projects::ApplicationController before_action :authorize_update_cluster!, only: [:update] before_action :authorize_admin_cluster!, only: [:destroy] before_action :update_applications_status, only: [:status] + helper_method :token_in_session STATUS_POLLING_INTERVAL = 10_000 @@ -190,8 +191,7 @@ class Projects::ClustersController < Projects::ApplicationController end def token_in_session - @token_in_session ||= - session[GoogleApi::CloudPlatform::Client.session_key_for_token] + session[GoogleApi::CloudPlatform::Client.session_key_for_token] end def expires_at_in_session |