projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3699-arv-copy
[arvados.git]
/
services
/
api
/
config
/
routes.rb
diff --git
a/services/api/config/routes.rb
b/services/api/config/routes.rb
index 46f0e7b819d2d58748c75545906d418700ba0627..bcfe9b863638798cac34c38e9ee15a4b53a1bce2 100644
(file)
--- a/
services/api/config/routes.rb
+++ b/
services/api/config/routes.rb
@@
-15,18
+15,22
@@
Server::Application.routes.draw do
get 'used_by', on: :member
end
resources :groups do
get 'used_by', on: :member
end
resources :groups do
+ get 'contents', on: :collection
get 'contents', on: :member
end
resources :humans
resources :job_tasks
resources :jobs do
get 'queue', on: :collection
get 'contents', on: :member
end
resources :humans
resources :job_tasks
resources :jobs do
get 'queue', on: :collection
- get '
log_tail_follow', on: :member
+ get '
queue_size', on: :collection
post 'cancel', on: :member
end
resources :keep_disks do
post 'ping', on: :collection
end
post 'cancel', on: :member
end
resources :keep_disks do
post 'ping', on: :collection
end
+ resources :keep_services do
+ get 'accessible', on: :collection
+ end
resources :links
resources :logs
resources :nodes do
resources :links
resources :logs
resources :nodes do
@@
-46,7
+50,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
@@
-55,6
+58,7
@@
Server::Application.routes.draw do
get 'logins', on: :member
get 'get_all_logins', on: :collection
end
get 'logins', on: :member
get 'get_all_logins', on: :collection
end
+ get '/permissions/:uuid', :to => 'links#get_permissions'
end
end
end
end