diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-10-08 01:10:06 +0300 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-10-14 12:07:01 +0300 |
| commit | 58368fbc53bfe7c2a9b425626819eae576afff09 (patch) | |
| tree | a66e1cad72a4fd959e06c54b628a49aad2e4547a /config | |
| parent | fa58068b2894b900d4b2519825411e0710557fc6 (diff) | |
Moved ci_status environments logic to new action ci_envrionments_status and set up frontend polling
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 5 | ||||
| -rw-r--r-- | config/routes/project.rb | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/config/routes.rb b/config/routes.rb index 83c3a42c19f..68dc84d9c9e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -83,9 +83,4 @@ Rails.application.routes.draw do draw :group draw :user draw :project - - # Get all keys of user - get ':username.keys' => 'profiles/keys#get_keys', constraints: { username: /.*/ } - - root to: "root#index" end diff --git a/config/routes/project.rb b/config/routes/project.rb index f9d58f5d5b2..200922b74db 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -273,6 +273,7 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: post :merge post :cancel_merge_when_build_succeeds get :ci_status + get :ci_environments_status post :toggle_subscription post :remove_wip get :diff_for_path |