projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2871-preload-objects
[arvados.git]
/
services
/
api
/
config
/
routes.rb
diff --git
a/services/api/config/routes.rb
b/services/api/config/routes.rb
index 0223c04da4d4fc9783dce3eb61b0e8820a84f49d..e4d2975a571699d85d39887cd30bd24725639db2 100644
(file)
--- a/
services/api/config/routes.rb
+++ b/
services/api/config/routes.rb
@@
-21,7
+21,6
@@
Server::Application.routes.draw do
resources :job_tasks
resources :jobs do
get 'queue', on: :collection
resources :job_tasks
resources :jobs do
get 'queue', on: :collection
- get 'log_tail_follow', on: :member
post 'cancel', on: :member
end
resources :keep_disks do
post 'cancel', on: :member
end
resources :keep_disks do
@@
-49,7
+48,6
@@
Server::Application.routes.draw do
resources :users do
get 'current', on: :collection
get 'system', on: :collection
resources :users do
get 'current', on: :collection
get 'system', on: :collection
- get 'event_stream', on: :member
post 'activate', on: :member
post 'setup', on: :collection
post 'unsetup', on: :member
post 'activate', on: :member
post 'setup', on: :collection
post 'unsetup', on: :member