projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10078: Since we are not fetching components for pipeline instances (at least until...
[arvados.git]
/
apps
/
workbench
/
config
/
load_config.rb
diff --git
a/apps/workbench/config/load_config.rb
b/apps/workbench/config/load_config.rb
index f14c3ca8456b3b252574027f3b4ba53ad501ff85..95f6edc95267a04e9dbb97fd6d56799575f9ea83 100644
(file)
--- a/
apps/workbench/config/load_config.rb
+++ b/
apps/workbench/config/load_config.rb
@@
-7,7
+7,7
@@
$application_config = {}
path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
if File.exists? path
yaml = ERB.new(IO.read path).result(binding)
path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
if File.exists? path
yaml = ERB.new(IO.read path).result(binding)
- confs = YAML.load(yaml)
+ confs = YAML.load(yaml
, deserialize_symbols: true
)
$application_config.merge!(confs['common'] || {})
$application_config.merge!(confs[::Rails.env.to_s] || {})
end
$application_config.merge!(confs['common'] || {})
$application_config.merge!(confs[::Rails.env.to_s] || {})
end