diff options
author | Dennis Tang <dtang@gitlab.com> | 2018-05-24 11:18:17 +0200 |
---|---|---|
committer | Dennis Tang <dtang@gitlab.com> | 2018-05-26 00:15:00 +0200 |
commit | 82430b2d460b5a956fcba0eda40fe4028405897f (patch) | |
tree | 6339184883dbbab785cef10028ad53653b41d0b0 | |
parent | db30e7f3b3883999d72dbf95b41d9a1de8b7ffc0 (diff) | |
download | gitlab-ce-82430b2d460b5a956fcba0eda40fe4028405897f.tar.gz |
cleanup
-rw-r--r-- | app/controllers/projects/clusters_controller.rb | 7 | ||||
-rw-r--r-- | app/views/projects/clusters/new.html.haml | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index 305bef4d080..c44949f2125 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -83,18 +83,17 @@ class Projects::ClustersController < Projects::ApplicationController redirect_to project_cluster_path(project, @cluster) else generate_gcp_authorize_url - active_tab = params[:type] case params[:type] when 'new' @new_cluster = @cluster - tap_existing_cluster + existing_cluster when 'existing' @existing_cluster = @cluster - tap_new_cluster + new_cluster end - render :new, locals: { active_tab: active_tab } + render :new, locals: { active_tab: params[:type] } end end diff --git a/app/views/projects/clusters/new.html.haml b/app/views/projects/clusters/new.html.haml index 6646edbc621..24084ceeb74 100644 --- a/app/views/projects/clusters/new.html.haml +++ b/app/views/projects/clusters/new.html.haml @@ -1,4 +1,3 @@ --# TODO: Combine gcp/new and user/new views - breadcrumb_title 'Kubernetes' - page_title _("Kubernetes Cluster") - active_tab = local_assigns.fetch(:active_tab, 'new') |