diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-11-15 20:17:42 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-11-16 14:33:00 +0100 |
| commit | b0a8840369ebe717be26125a59acab02c515cf22 (patch) | |
| tree | 39215c878ebc9bfbeba7907fa04501f07685d04a /app/controllers/projects/clusters_controller.rb | |
| parent | 9809e1d404ed1d386ac07e08e4832656325e5971 (diff) | |
| download | gitlab-ce-b0a8840369ebe717be26125a59acab02c515cf22.tar.gz | |
List multiple clusters on ClustersController#index
Also:
* Stub out index view
* Adds the clusters before_action that returns all clusters
Diffstat (limited to 'app/controllers/projects/clusters_controller.rb')
| -rw-r--r-- | app/controllers/projects/clusters_controller.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index 7808284fb82..6ffe108f7fa 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -1,5 +1,6 @@ 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] @@ -7,11 +8,6 @@ class Projects::ClustersController < Projects::ApplicationController before_action :authorize_admin_cluster!, only: [:destroy] def index - if project.cluster - redirect_to project_cluster_path(project, project.cluster) - else - redirect_to new_project_cluster_path(project) - end end def login @@ -91,6 +87,10 @@ 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, |