Merge branch 'master' into 3661-copy-move-from-show

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

diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 6236e0c51228b7285feae75724e0b2e91f08cf58..9f9696facecac5be44dc62f7506e2cb371985f44 100644 (file)
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -72,6 +72,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 +81,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'