projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14199: Merge branch 'master' into 14199-copy-from-remote
[arvados.git]
/
services
/
api
/
config
/
routes.rb
diff --git
a/services/api/config/routes.rb
b/services/api/config/routes.rb
index 2e9d618986825d1871c28ca38695c4ef7c046440..b54c3c5bf170cc431140a0925b9846e7f172b397 100644
(file)
--- a/
services/api/config/routes.rb
+++ b/
services/api/config/routes.rb
@@
-30,6
+30,9
@@
Server::Application.routes.draw do
resources :groups do
get 'contents', on: :collection
get 'contents', on: :member
resources :groups do
get 'contents', on: :collection
get 'contents', on: :member
+ get 'shared', on: :collection
+ post 'trash', on: :member
+ post 'untrash', on: :member
end
resources :humans
resources :job_tasks
end
resources :humans
resources :job_tasks
@@
-37,6
+40,7
@@
Server::Application.routes.draw do
get 'auth', on: :member
post 'lock', on: :member
post 'unlock', on: :member
get 'auth', on: :member
post 'lock', on: :member
post 'unlock', on: :member
+ get 'secret_mounts', on: :member
get 'current', on: :collection
end
resources :container_requests
get 'current', on: :collection
end
resources :container_requests
@@
-77,6
+81,8
@@
Server::Application.routes.draw do
post 'activate', on: :member
post 'setup', on: :collection
post 'unsetup', on: :member
post 'activate', on: :member
post 'setup', on: :collection
post 'unsetup', on: :member
+ post 'update_uuid', on: :member
+ post 'merge', on: :collection
end
resources :virtual_machines do
get 'logins', on: :member
end
resources :virtual_machines do
get 'logins', on: :member