projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
2659: Fix crash in /users/current when not logged in.
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
schema_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/schema_controller.rb
b/services/api/app/controllers/arvados/v1/schema_controller.rb
index 20400d228620d0b29ee808eaf4dec27ccd871ae1..bc5a20fb0db8f0a392558af563529904eeb86fd1 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/schema_controller.rb
@@
-26,6
+26,7
@@
class Arvados::V1::SchemaController < ApplicationController
rootUrl: root_url,
servicePath: "arvados/v1/",
batchPath: "batch",
+ defaultTrashLifetime: Rails.application.config.default_trash_lifetime,
parameters: {
alt: {
type: "string",
@@
-390,6
+391,6
@@
class Arvados::V1::SchemaController < ApplicationController
end
discovery
end
-
render json:
discovery
+
send_json
discovery
end
end