diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-11-07 10:14:22 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-11-07 10:14:22 +0000 |
| commit | ce7e60f6d77f4c7ad78ec97f3d5b8dcc9b12c03d (patch) | |
| tree | c60fcca10bd75371ff424371c1f68c8feba8d516 /config | |
| parent | 39afe3bc15d27b98938c78a655fa2d7fdfbcaa0a (diff) | |
| parent | 8d51a2f48a8c5319dd2f6bf53de58bfe0a13949d (diff) | |
| download | gitlab-ce-ce7e60f6d77f4c7ad78ec97f3d5b8dcc9b12c03d.tar.gz | |
Merge branch '35616-move-gke-form-1st-iteration' into 'master'
First iteration of Move Kubernetes from service to Cluster page
See merge request gitlab-org/gitlab-ce!15061
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 1 |
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 |