diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-10-09 12:52:51 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-10-09 12:52:51 +0000 |
| commit | 2409acfa7f97fef81dd66640c64e9d0008b85cde (patch) | |
| tree | 1dcafa5cd5b4646ddaf6d736cc2a15d60d0f0c19 /config/routes/project.rb | |
| parent | 0f366c74131339cb45c8943437fe5b3e68721c75 (diff) | |
| parent | f277fa14094e5515e2317d2baa1fa0bfb95966da (diff) | |
| download | gitlab-ce-2409acfa7f97fef81dd66640c64e9d0008b85cde.tar.gz | |
Merge branch 'master' into 'group-sort-dropdown-blank'
# Conflicts:
# spec/features/dashboard/group_spec.rb
Diffstat (limited to 'config/routes/project.rb')
| -rw-r--r-- | config/routes/project.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 70d7673250c..7f0e056c884 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -183,6 +183,16 @@ constraints(ProjectUrlConstrainer.new) do end end + resources :clusters, except: [:edit] do + collection do + get :login + end + + member do + get :status, format: :json + end + end + resources :environments, except: [:destroy] do member do post :stop |