projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 9687-container-request-display
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
arvados_api_client.rb
diff --git
a/apps/workbench/app/models/arvados_api_client.rb
b/apps/workbench/app/models/arvados_api_client.rb
index ca09aa719d1cddfc208d2d0e79ec74d3438aaa94..13d4a24c69cc5f7e687c47c0e95ed715ab9f5fa2 100644
(file)
--- a/
apps/workbench/app/models/arvados_api_client.rb
+++ b/
apps/workbench/app/models/arvados_api_client.rb
@@
-89,7
+89,10
@@
class ArvadosApiClient
@api_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
else
# Use system CA certificates
@api_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
else
# Use system CA certificates
- @api_client.ssl_config.add_trust_ca('/etc/ssl/certs')
+ ["/etc/ssl/certs/ca-certificates.crt",
+ "/etc/pki/tls/certs/ca-bundle.crt"]
+ .select { |ca_path| File.readable?(ca_path) }
+ .each { |ca_path| @api_client.ssl_config.add_trust_ca(ca_path) }
end
if Rails.configuration.api_response_compression
@api_client.transparent_gzip_decompression = true
end
if Rails.configuration.api_response_compression
@api_client.transparent_gzip_decompression = true
@@
-121,7
+124,7
@@
class ArvadosApiClient
elsif v == false
query[k] = 0
else
elsif v == false
query[k] = 0
else
- query[k] =
JSON.dump(v
)
+ query[k] =
Oj.dump(v, mode: :compat
)
end
end
else
end
end
else