summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-04 03:34:13 +0900
committerShinya Maeda <shinya@gitlab.com>2017-11-04 03:34:13 +0900
commit3278b0a5ffca9ccbe0c043b1f9ef79d0ce4af813 (patch)
tree1494208cf93df507acb65804bb7e4f66be2f990c /config
parent8fb7e87806e8ae94ee40e56400625886cbcf411e (diff)
parentdb98ce38b5bdb38fae6b62298432841a1f4670f0 (diff)
downloadgitlab-ce-3278b0a5ffca9ccbe0c043b1f9ef79d0ce4af813.tar.gz
Merge branch '35616-move-gke-form-1st-iteration' into move-kubernetes-from-service-to-clusters-page-10-2-ver
Diffstat (limited to 'config')
-rw-r--r--config/routes/project.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 746c0c46677..c52dd542c90 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -186,6 +186,7 @@ constraints(ProjectUrlConstrainer.new) do
resources :clusters, except: [:edit] do
collection do
get :login
+ get '/providers/gcp/new', action: :new_gcp
end
member do