From: Tom Clegg <tom@curoverse.com>
Date: Wed, 30 Apr 2014 18:14:42 +0000 (-0400)
Subject: Merge branch '2640-folder-api' into 1970-folder-view
X-Git-Tag: 1.1.0~2596^2~11^2~43
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/20347d900fb2d75a3f3eef91d4da17a559b0ecd6

Merge branch '2640-folder-api' into 1970-folder-view
---

20347d900fb2d75a3f3eef91d4da17a559b0ecd6
diff --cc apps/workbench/config/routes.rb
index 2d025664dc,f915671b53..c64c31e914
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@@ -40,9 -40,10 +40,11 @@@ ArvadosWorkbench::Application.routes.dr
    end
    resources :links
    match '/collections/graph' => 'collections#graph'
-   resources :collections
+   resources :collections do
+     post 'set_persistent', on: :member
+   end
    get '/collections/:uuid/*file' => 'collections#show_file', :format => false
 +  resources :folders
  
    post 'actions' => 'actions#post'