Merge branch 'master' of git.clinicalfuture.com:arvados

[arvados.git] / services / api / config / routes.rb

diff --git a/services/api/config/routes.rb b/services/api/config/routes.rb
index 398645462a4b78a233ad921d910f12da02a60bfb..ebb5c6927109e25d4d9db6626f14f282d1cc0c52 100644 (file)
--- a/services/api/config/routes.rb
+++ b/services/api/config/routes.rb
@@ -1,4 +1,6 @@
 Server::Application.routes.draw do
+  resources :humans
+  resources :traits
   resources :repositories
   resources :virtual_machines
   resources :authorized_keys
@@ -84,7 +86,10 @@ Server::Application.routes.draw do
       match '/users/current' => 'users#current'
       match '/users/system' => 'users#system'
       match '/jobs/queue' => 'jobs#queue'
+      match '/jobs/:uuid/log_tail_follow' => 'jobs#log_tail_follow'
       match '/virtual_machines/get_all_logins' => 'virtual_machines#get_all_logins'
+      match '/virtual_machines/:uuid/logins' => 'virtual_machines#logins'
+      post '/api_client_authorizations/create_system_auth' => 'api_client_authorizations#create_system_auth'
       match '/repositories/get_all_permissions' => 'repositories#get_all_permissions'
       resources :collections
       resources :links
@@ -95,12 +100,16 @@ Server::Application.routes.draw do
       resources :groups
       resources :logs
       resources :users
+      resources :api_clients
+      resources :api_client_authorizations
       resources :jobs
       resources :job_tasks
       resources :keep_disks
       resources :authorized_keys
       resources :virtual_machines
       resources :repositories
+      resources :traits
+      resources :humans
     end
   end