Merge branch 'master' into 4823-python-sdk-writable-collection-api

[arvados.git] / apps / workbench / config / routes.rb

diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 6236e0c51228b7285feae75724e0b2e91f08cf58..6b29d0553d4f0903973f40f951fde82d99ab3144 100644 (file)
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -16,12 +16,15 @@ ArvadosWorkbench::Application.routes.draw do
   resources :humans
   resources :traits
   resources :api_client_authorizations
-  resources :repositories
   resources :virtual_machines
   resources :authorized_keys
   resources :job_tasks
   resources :jobs do
     post 'cancel', :on => :member
+    get 'logs', :on => :member
+  end
+  resources :repositories do
+    post 'share_with', on: :member
   end
   match '/logout' => 'sessions#destroy', via: [:get, :post]
   get '/logged_out' => 'sessions#index'
@@ -72,6 +75,7 @@ ArvadosWorkbench::Application.routes.draw do
     match 'remove_items', on: :member, via: :delete, action: :remove_items
     get 'choose', on: :collection
     post 'share_with', on: :member
+    get 'tab_counts', on: :member
   end
   resources :search do
     get 'choose', :on => :collection
@@ -80,7 +84,7 @@ ArvadosWorkbench::Application.routes.draw do
   post 'actions' => 'actions#post'
   get 'actions' => 'actions#show'
   get 'websockets' => 'websocket#index'
-  get 'combine_selected' => 'actions#combine_selected_files_into_collection', :as => :combine_selected
+  post "combine_selected" => 'actions#combine_selected_files_into_collection'
 
   root :to => 'projects#index'