Merge remote-tracking branch 'origin/master' into 1971-show-image-thumbnails

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

diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 9f8486d755ff09c06ecb4c931d75649e67cdd40b..5330a9148a2f8574c0d410e8ff83acb67eaa4911 100644 (file)
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -1,13 +1,13 @@
 ArvadosWorkbench::Application.routes.draw do
-  resources :nodes
-
+  themes_for_rails
 
+  resources :keep_disks
+  resources :user_agreements
+  post '/user_agreements/sign' => 'user_agreements#sign'
+  get '/user_agreements/signatures' => 'user_agreements#signatures'
+  resources :nodes
   resources :humans
-
-
   resources :traits
-
-
   resources :api_client_authorizations
   resources :repositories
   resources :virtual_machines
@@ -26,10 +26,13 @@ ArvadosWorkbench::Application.routes.draw do
   resources :groups
   resources :specimens
   resources :pipeline_templates
-  resources :pipeline_instances
+  resources :pipeline_instances do
+    get 'compare', on: :collection
+  end
   resources :links
   match '/collections/graph' => 'collections#graph'
   resources :collections
+  get '/collections/:uuid/*file' => 'collections#show_file', :format => false
   root :to => 'users#welcome'
 
   # Send unroutable requests to an arbitrary controller