projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/master' into 3605-improved-dashboard
[arvados.git]
/
apps
/
workbench
/
config
/
routes.rb
diff --git
a/apps/workbench/config/routes.rb
b/apps/workbench/config/routes.rb
index 8f01a767b35e3d259f8337e243875e5a3e8fda5c..65a8e541f70b95be5c47108c8daa42148f1b37c6 100644
(file)
--- a/
apps/workbench/config/routes.rb
+++ b/
apps/workbench/config/routes.rb
@@
-80,6
+80,7
@@
ArvadosWorkbench::Application.routes.draw do
post 'actions' => 'actions#post'
get 'actions' => 'actions#show'
get 'websockets' => 'websocket#index'
+ post "combine_selected" => 'actions#combine_selected_files_into_collection'
root :to => 'projects#index'