kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Move cluster loading to ClustersController#index

This commit is contained in:
Matija Čupić 2017-11-16 14:40:30 +01:00
parent c544266d4c
commit cc0c611555
No known key found for this signature in database
GPG Key ID: 4BAF84FFACD2E5DE
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/projects/clusters_controller.rb
View File

@ -1,6 +1,5 @@
class Projects::ClustersController < Projects::ApplicationController
before_action :cluster, except: [:login, :index, :new, :new_gcp, :create]
before_action :clusters, only: [:index]
before_action :authorize_read_cluster!
before_action :authorize_create_cluster!, only: [:new, :new_gcp, :create]
before_action :authorize_google_api, only: [:new_gcp, :create]
@ -8,6 +7,7 @@ class Projects::ClustersController < Projects::ApplicationController
before_action :authorize_admin_cluster!, only: [:destroy]
def index
@clusters ||= project.clusters.map { |cluster| cluster.present(current_user: current_user) }
end
def login
@ -87,10 +87,6 @@ class Projects::ClustersController < Projects::ApplicationController
@cluster ||= project.clusters.find_by(id: params[:id])&.present(current_user: current_user) || render_404
end
def clusters
@clusters ||= project.clusters.map { |cluster| cluster.present(current_user: current_user) }
end
def create_params
params.require(:cluster).permit(
:enabled,