projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '21412-user-profile-bugs'
[arvados.git]
/
services
/
api
/
config
/
routes.rb
diff --git
a/services/api/config/routes.rb
b/services/api/config/routes.rb
index b54c3c5bf170cc431140a0925b9846e7f172b397..b87e86f664de7e3230331e8233744ac589e4a169 100644
(file)
--- a/
services/api/config/routes.rb
+++ b/
services/api/config/routes.rb
@@
-2,7
+2,7
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
-
Server::A
pplication.routes.draw do
+
Rails.a
pplication.routes.draw do
themes_for_rails
# OPTIONS requests are not allowed at routes that use cookies.
themes_for_rails
# OPTIONS requests are not allowed at routes that use cookies.
@@
-40,10
+40,13
@@
Server::Application.routes.draw do
get 'auth', on: :member
post 'lock', on: :member
post 'unlock', on: :member
get 'auth', on: :member
post 'lock', on: :member
post 'unlock', on: :member
+ post 'update_priority', on: :member
get 'secret_mounts', on: :member
get 'current', on: :collection
end
get 'secret_mounts', on: :member
get 'current', on: :collection
end
- resources :container_requests
+ resources :container_requests do
+ get 'container_status', on: :member
+ end
resources :jobs do
get 'queue', on: :collection
get 'queue_size', on: :collection
resources :jobs do
get 'queue', on: :collection
get 'queue_size', on: :collection
@@
-81,8
+84,8
@@
Server::Application.routes.draw do
post 'activate', on: :member
post 'setup', on: :collection
post 'unsetup', on: :member
post 'activate', on: :member
post 'setup', on: :collection
post 'unsetup', on: :member
- post 'update_uuid', on: :member
post 'merge', on: :collection
post 'merge', on: :collection
+ patch 'batch_update', on: :collection
end
resources :virtual_machines do
get 'logins', on: :member
end
resources :virtual_machines do
get 'logins', on: :member
@@
-92,6
+95,8
@@
Server::Application.routes.draw do
end
end
end
end
+ post '/sys/trash_sweep', to: 'sys#trash_sweep'
+
if Rails.env == 'test'
post '/database/reset', to: 'database#reset'
end
if Rails.env == 'test'
post '/database/reset', to: 'database#reset'
end
@@
-110,7
+115,8
@@
Server::Application.routes.draw do
match '/static/login_failure', to: 'static#login_failure', as: :login_failure, via: [:get, :post]
match '/static/login_failure', to: 'static#login_failure', as: :login_failure, via: [:get, :post]
- match '/_health/ping', to: 'arvados/v1/healthcheck#ping', via: [:get]
+ match '/_health/:check', to: 'arvados/v1/management#health', via: [:get]
+ match '/metrics', to: 'arvados/v1/management#metrics', via: [:get]
# Send unroutable requests to an arbitrary controller
# (ends up at ApplicationController#render_not_found)
# Send unroutable requests to an arbitrary controller
# (ends up at ApplicationController#render_not_found)