projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4889-crunch-deadlock'
[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 eccee8a70b18d183dfb69ceadf7932fce4933baf..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",
rootUrl: root_url,
servicePath: "arvados/v1/",
batchPath: "batch",
+ defaultTrashLifetime: Rails.application.config.default_trash_lifetime,
parameters: {
alt: {
type: "string",
parameters: {
alt: {
type: "string",
@@
-58,10
+59,10
@@
class Arvados::V1::SchemaController < ApplicationController
auth: {
oauth2: {
scopes: {
auth: {
oauth2: {
scopes: {
- "https://api.c
linicalfutur
e.com/auth/arvados" => {
+ "https://api.c
urovers
e.com/auth/arvados" => {
description: "View and manage objects"
},
description: "View and manage objects"
},
- "https://api.c
linicalfutur
e.com/auth/arvados.readonly" => {
+ "https://api.c
urovers
e.com/auth/arvados.readonly" => {
description: "View objects"
}
}
description: "View objects"
}
}
@@
-171,8
+172,8
@@
class Arvados::V1::SchemaController < ApplicationController
"$ref" => k.to_s
},
scopes: [
"$ref" => k.to_s
},
scopes: [
- "https://api.c
linicalfutur
e.com/auth/arvados",
- "https://api.c
linicalfutur
e.com/auth/arvados.readonly"
+ "https://api.c
urovers
e.com/auth/arvados",
+ "https://api.c
urovers
e.com/auth/arvados.readonly"
]
},
list: {
]
},
list: {
@@
-248,8
+249,8
@@
class Arvados::V1::SchemaController < ApplicationController
"$ref" => "#{k.to_s}List"
},
scopes: [
"$ref" => "#{k.to_s}List"
},
scopes: [
- "https://api.c
linicalfutur
e.com/auth/arvados",
- "https://api.c
linicalfutur
e.com/auth/arvados.readonly"
+ "https://api.c
urovers
e.com/auth/arvados",
+ "https://api.c
urovers
e.com/auth/arvados.readonly"
]
},
create: {
]
},
create: {
@@
-270,7
+271,7
@@
class Arvados::V1::SchemaController < ApplicationController
"$ref" => k.to_s
},
scopes: [
"$ref" => k.to_s
},
scopes: [
- "https://api.c
linicalfutur
e.com/auth/arvados"
+ "https://api.c
urovers
e.com/auth/arvados"
]
},
update: {
]
},
update: {
@@
-298,7
+299,7
@@
class Arvados::V1::SchemaController < ApplicationController
"$ref" => k.to_s
},
scopes: [
"$ref" => k.to_s
},
scopes: [
- "https://api.c
linicalfutur
e.com/auth/arvados"
+ "https://api.c
urovers
e.com/auth/arvados"
]
},
delete: {
]
},
delete: {
@@
-318,7
+319,7
@@
class Arvados::V1::SchemaController < ApplicationController
"$ref" => k.to_s
},
scopes: [
"$ref" => k.to_s
},
scopes: [
- "https://api.c
linicalfutur
e.com/auth/arvados"
+ "https://api.c
urovers
e.com/auth/arvados"
]
}
}
]
}
}
@@
-345,7
+346,7
@@
class Arvados::V1::SchemaController < ApplicationController
"$ref" => (action == 'index' ? "#{k.to_s}List" : k.to_s)
},
scopes: [
"$ref" => (action == 'index' ? "#{k.to_s}List" : k.to_s)
},
scopes: [
- "https://api.c
linicalfutur
e.com/auth/arvados"
+ "https://api.c
urovers
e.com/auth/arvados"
]
}
route.segment_keys.each do |key|
]
}
route.segment_keys.each do |key|
@@
-390,6
+391,6
@@
class Arvados::V1::SchemaController < ApplicationController
end
discovery
end
end
discovery
end
-
render json:
discovery
+
send_json
discovery
end
end
end
end