Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-11-01 14:11:47 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2017-11-01 14:11:47 +0300
commit882cf2e409ce2ea798fce7f3082083fcdf143baf (patch)
tree6980c0759b955bcf00f4710dac4a7a251178ebb1 /app/controllers/projects/clusters_controller.rb
parent5754908fee556062ab2e42a418bf192a0bf56402 (diff)
Fix paths to the first page
Diffstat (limited to 'app/controllers/projects/clusters_controller.rb')
-rw-r--r--app/controllers/projects/clusters_controller.rb16
1 files changed, 7 insertions, 9 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb
index 95e2f6a1257..23613b98e8c 100644
--- a/app/controllers/projects/clusters_controller.rb
+++ b/app/controllers/projects/clusters_controller.rb
@@ -1,8 +1,8 @@
class Projects::ClustersController < Projects::ApplicationController
- before_action :cluster, except: [:login, :index, :new, :create]
+ before_action :cluster, except: [:login, :index, :new, :new_gcp, :create]
before_action :authorize_read_cluster!
- before_action :authorize_create_cluster!, only: [:new, :create]
- before_action :authorize_google_api, only: [:new, :create]
+ before_action :authorize_create_cluster!, only: [:new, :new_gcp, :create]
+ before_action :authorize_google_api, only: [:new_gcp, :create]
before_action :authorize_update_cluster!, only: [:update]
before_action :authorize_admin_cluster!, only: [:destroy]
@@ -16,7 +16,7 @@ class Projects::ClustersController < Projects::ApplicationController
def login
begin
- state = generate_session_key_redirect(namespace_project_clusters_url.to_s)
+ state = generate_session_key_redirect(providers_gcp_new_namespace_project_clusters_url.to_s)
@authorize_url = GoogleApi::CloudPlatform::Client.new(
nil, callback_google_api_auth_url,
@@ -26,13 +26,11 @@ class Projects::ClustersController < Projects::ApplicationController
end
end
- # TODO fix this
- def new_kubernetes_form
- @cluster = project.build_cluster
+ def new
end
- def new
- # First page!
+ def new_gcp
+ @cluster = project.build_cluster
end
def create