projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3454-default-docker-image
[arvados.git]
/
services
/
api
/
app
/
models
/
collection.rb
diff --git
a/services/api/app/models/collection.rb
b/services/api/app/models/collection.rb
index 89ad874cd7d211aae90f841927a620150af1ab9b..ccfb35e49685e6746312291c852bfb2e5ed1867f 100644
(file)
--- a/
services/api/app/models/collection.rb
+++ b/
services/api/app/models/collection.rb
@@
-60,7
+60,7
@@
class Collection < ArvadosModel
signing_opts = {
key: Rails.configuration.blob_signing_key,
api_token: api_token,
signing_opts = {
key: Rails.configuration.blob_signing_key,
api_token: api_token,
- ttl: Rails.configuration.blob_sign
ing
_ttl,
+ ttl: Rails.configuration.blob_sign
ature
_ttl,
}
self.manifest_text.lines.each do |entry|
entry.split[1..-1].each do |tok|
}
self.manifest_text.lines.each do |entry|
entry.split[1..-1].each do |tok|
@@
-195,7
+195,7
@@
class Collection < ArvadosModel
signing_opts = {
key: Rails.configuration.blob_signing_key,
api_token: token,
signing_opts = {
key: Rails.configuration.blob_signing_key,
api_token: token,
- ttl: Rails.configuration.blob_sign
ing
_ttl,
+ ttl: Rails.configuration.blob_sign
ature
_ttl,
}
m = manifest.dup
munge_manifest_locators!(m) do |loc|
}
m = manifest.dup
munge_manifest_locators!(m) do |loc|