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 b229511de6a61ce5db09b90ddeaec8e79c1f7b54..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 'owned_items', on: :member
+        get 'contents', 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
+      resources :keep_services do
+        get 'accessible', on: :collection
+      end
       resources :links
       resources :logs
       resources :nodes do
@@ -46,16 +50,15 @@ Server::Application.routes.draw do
       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
-        get 'owned_items', on: :member
       end
       resources :virtual_machines do
         get 'logins', on: :member
         get 'get_all_logins', on: :collection
       end
+      get '/permissions/:uuid', :to => 'links#get_permissions'
     end
   end