projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 7454-azure-custom-data
[arvados.git]
/
apps
/
workbench
/
config
/
routes.rb
diff --git
a/apps/workbench/config/routes.rb
b/apps/workbench/config/routes.rb
index 44d7ded6c10c70cd1f7f72f627ce619011828ec5..487fb3fdd329a06e13bfa35216de0517e9822c6c 100644
(file)
--- a/
apps/workbench/config/routes.rb
+++ b/
apps/workbench/config/routes.rb
@@
-17,6
+17,7
@@
ArvadosWorkbench::Application.routes.draw do
resources :traits
resources :api_client_authorizations
resources :virtual_machines
resources :traits
resources :api_client_authorizations
resources :virtual_machines
+ get '/virtual_machines/:id/webshell/:login' => 'virtual_machines#webshell', :as => :webshell_virtual_machine
resources :authorized_keys
resources :job_tasks
resources :jobs do
resources :authorized_keys
resources :job_tasks
resources :jobs do
@@
-45,8
+46,11
@@
ArvadosWorkbench::Application.routes.draw do
get 'setup_popup', :on => :member
get 'profile', :on => :member
post 'request_shell_access', :on => :member
get 'setup_popup', :on => :member
get 'profile', :on => :member
post 'request_shell_access', :on => :member
+ get 'virtual_machines', :on => :member
+ get 'repositories', :on => :member
+ get 'ssh_keys', :on => :member
end
end
- get '/
manage_account' => 'users#manage_account
'
+ get '/
current_token' => 'users#current_token
'
get "/add_ssh_key_popup" => 'users#add_ssh_key_popup', :as => :add_ssh_key_popup
get "/add_ssh_key" => 'users#add_ssh_key', :as => :add_ssh_key
resources :logs
get "/add_ssh_key_popup" => 'users#add_ssh_key_popup', :as => :add_ssh_key_popup
get "/add_ssh_key" => 'users#add_ssh_key', :as => :add_ssh_key
resources :logs
@@
-82,7
+86,9
@@
ArvadosWorkbench::Application.routes.draw do
get 'choose', on: :collection
post 'share_with', on: :member
get 'tab_counts', on: :member
get 'choose', on: :collection
post 'share_with', on: :member
get 'tab_counts', on: :member
+ get 'public', on: :collection
end
end
+
resources :search do
get 'choose', :on => :collection
end
resources :search do
get 'choose', :on => :collection
end