projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2290-user-activity
[arvados.git]
/
apps
/
workbench
/
config
/
routes.rb
diff --git
a/apps/workbench/config/routes.rb
b/apps/workbench/config/routes.rb
index 9f8486d755ff09c06ecb4c931d75649e67cdd40b..0981d2ea37689e7b99635ed8bd1747e4fb409f93 100644
(file)
--- a/
apps/workbench/config/routes.rb
+++ b/
apps/workbench/config/routes.rb
@@
-1,13
+1,15
@@
ArvadosWorkbench::Application.routes.draw do
ArvadosWorkbench::Application.routes.draw do
- resources :nodes
-
+ themes_for_rails
+ resources :keep_disks
+ resources :user_agreements do
+ put 'sign', on: :collection
+ get 'signatures', on: :collection
+ end
+ get '/user_agreements/signatures' => 'user_agreements#signatures'
+ resources :nodes
resources :humans
resources :humans
-
-
resources :traits
resources :traits
-
-
resources :api_client_authorizations
resources :repositories
resources :virtual_machines
resources :api_client_authorizations
resources :repositories
resources :virtual_machines
@@
-19,6
+21,8
@@
ArvadosWorkbench::Application.routes.draw do
resources :users do
get 'home', :on => :member
get 'welcome', :on => :collection
resources :users do
get 'home', :on => :member
get 'welcome', :on => :collection
+ get 'activity', :on => :collection
+ post 'sudo', :on => :member
end
resources :logs
resources :factory_jobs
end
resources :logs
resources :factory_jobs
@@
-26,10
+30,16
@@
ArvadosWorkbench::Application.routes.draw do
resources :groups
resources :specimens
resources :pipeline_templates
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
resources :links
match '/collections/graph' => 'collections#graph'
resources :collections
+ get '/collections/:uuid/*file' => 'collections#show_file', :format => false
+
+ post 'actions' => 'actions#post'
+
root :to => 'users#welcome'
# Send unroutable requests to an arbitrary controller
root :to => 'users#welcome'
# Send unroutable requests to an arbitrary controller