projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3112-report-bug
[arvados.git]
/
apps
/
workbench
/
config
/
routes.rb
diff --git
a/apps/workbench/config/routes.rb
b/apps/workbench/config/routes.rb
index 4ef26612ab194a2df62eefa3945aa1ab75ab5c4e..e58796e40ccf1ee7988cb06bb7caea8b2b1e6e33 100644
(file)
--- a/
apps/workbench/config/routes.rb
+++ b/
apps/workbench/config/routes.rb
@@
-10,6
+10,8
@@
ArvadosWorkbench::Application.routes.draw do
get '/user_agreements/signatures' => 'user_agreements#signatures'
get "users/setup_popup" => 'users#setup_popup', :as => :setup_user_popup
get "users/setup" => 'users#setup', :as => :setup_user
get '/user_agreements/signatures' => 'user_agreements#signatures'
get "users/setup_popup" => 'users#setup_popup', :as => :setup_user_popup
get "users/setup" => 'users#setup', :as => :setup_user
+ get "report_issue_popup" => 'actions#report_issue_popup', :as => :report_issue_popup
+ post "report_issue" => 'actions#report_issue', :as => :report_issue
resources :nodes
resources :humans
resources :traits
resources :nodes
resources :humans
resources :traits
@@
-27,6
+29,7
@@
ArvadosWorkbench::Application.routes.draw do
get 'choose', :on => :collection
get 'home', :on => :member
get 'welcome', :on => :collection
get 'choose', :on => :collection
get 'home', :on => :member
get 'welcome', :on => :collection
+ get 'inactive', :on => :collection
get 'activity', :on => :collection
get 'storage', :on => :collection
post 'sudo', :on => :member
get 'activity', :on => :collection
get 'storage', :on => :collection
post 'sudo', :on => :member