projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '11070-ws-listener-problem'
[arvados.git]
/
services
/
api
/
config
/
routes.rb
diff --git
a/services/api/config/routes.rb
b/services/api/config/routes.rb
index c85a3fc57af20d2461516c384623a452a86dbdda..9cb53fee3057752e3382310404ef8dbf73ccf14e 100644
(file)
--- a/
services/api/config/routes.rb
+++ b/
services/api/config/routes.rb
@@
-15,12
+15,14
@@
Server::Application.routes.draw do
namespace :v1 do
resources :api_client_authorizations do
post 'create_system_auth', on: :collection
namespace :v1 do
resources :api_client_authorizations do
post 'create_system_auth', on: :collection
+ get 'current', on: :collection
end
resources :api_clients
resources :authorized_keys
resources :collections do
get 'provenance', on: :member
get 'used_by', on: :member
end
resources :api_clients
resources :authorized_keys
resources :collections do
get 'provenance', on: :member
get 'used_by', on: :member
+ post 'trash', on: :member
end
resources :groups do
get 'contents', on: :collection
end
resources :groups do
get 'contents', on: :collection
@@
-28,7
+30,12
@@
Server::Application.routes.draw do
end
resources :humans
resources :job_tasks
end
resources :humans
resources :job_tasks
- resources :containers
+ resources :containers do
+ get 'auth', on: :member
+ post 'lock', on: :member
+ post 'unlock', on: :member
+ get 'current', on: :collection
+ end
resources :container_requests
resources :jobs do
get 'queue', on: :collection
resources :container_requests
resources :jobs do
get 'queue', on: :collection
@@
-47,8
+54,11
@@
Server::Application.routes.draw do
resources :nodes do
post 'ping', on: :member
end
resources :nodes do
post 'ping', on: :member
end
- resources :pipeline_instances
+ resources :pipeline_instances do
+ post 'cancel', on: :member
+ end
resources :pipeline_templates
resources :pipeline_templates
+ resources :workflows
resources :repositories do
get 'get_all_permissions', on: :collection
end
resources :repositories do
get 'get_all_permissions', on: :collection
end