diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-12-05 15:29:41 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-12-05 15:29:41 +0300 |
| commit | 9429514e303bdceee0621b5c4bf02ad8ca0a7add (patch) | |
| tree | a7bc5cc425601c4ea73ff9a9be90eebc21a93b17 /app/controllers/projects/clusters_controller.rb | |
| parent | b9d8d85e20af046c7dbe11c69fd3252f0486b9b2 (diff) | |
| parent | 3138fcdcd70fd30fea74deff537b9836d6c94d21 (diff) | |
Merge branch '35616-move-k8-to-cluster-page' into cluster-page-with-list-clusters
Diffstat (limited to 'app/controllers/projects/clusters_controller.rb')
| -rw-r--r-- | app/controllers/projects/clusters_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index ae22243c0ee..e0ded4ceb2f 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -22,7 +22,7 @@ class Projects::ClustersController < Projects::ApplicationController def status respond_to do |format| format.json do - Gitlab::PollingInterval.set_header(response, interval: 10_000) + Gitlab::PollingInterval.set_header(response, interval: STATUS_POLLING_INTERVAL) render json: ClusterSerializer .new(project: @project, current_user: @current_user) @@ -70,7 +70,8 @@ class Projects::ClustersController < Projects::ApplicationController private def cluster - @cluster ||= project.clusters.find_by(id: params[:id])&.present(current_user: current_user) || render_404 + @cluster ||= project.clusters.find(params[:id]) + .present(current_user: current_user) end def create_params |