diff options
author | Dennis Tang <dtang@gitlab.com> | 2018-05-15 12:30:18 +0200 |
---|---|---|
committer | Dennis Tang <dtang@gitlab.com> | 2018-05-26 00:15:00 +0200 |
commit | 1a30e153a81b08cf2a992f8ad491aecaa7290eab (patch) | |
tree | fe57d8456c1ba36fe0fe83a355403c9547fc4f79 /config | |
parent | 95a63a881673533e3fd44243297d1a81e19396b6 (diff) | |
download | gitlab-ce-1a30e153a81b08cf2a992f8ad491aecaa7290eab.tar.gz |
combine "create" and "existing" GKE cluster views into one new page
# Conflicts:
# app/controllers/projects/clusters/gcp_controller.rb
# app/views/projects/clusters/gcp/_form.html.haml
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/project.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 5a1be1a8b73..4584c8d74a8 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -206,14 +206,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :clusters, except: [:edit, :create] do collection do - scope :providers do - get '/user/new', to: 'clusters/user#new' - post '/user', to: 'clusters/user#create' - - get '/gcp/new', to: 'clusters/gcp#new' - get '/gcp/login', to: 'clusters/gcp#login' - post '/gcp', to: 'clusters/gcp#create' - end + post '/new', to: 'clusters#create_cluster' end member do |