[ARVADOS] updated: 1.3.0-739-g8b5dff309

[Git user]

Summary of changes:
 services/api/config/arvados_config.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  8b5dff30937a7c12dcf7cd71153770393266500d (commit)
      from  b05be6e2d1db4e63074fc28e978c40a271376f1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8b5dff30937a7c12dcf7cd71153770393266500d
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Apr 11 16:47:07 2019 -0400

    13996: Enable ERB for application.yml and database.yml
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb
index b6d3ae051..717ddad9e 100644
--- a/services/api/config/arvados_config.rb
+++ b/services/api/config/arvados_config.rb
@@ -175,7 +175,7 @@ dbcfg.declare_config "PostgreSQL.Connection.Encoding", String, :encoding
 application_config = {}
 %w(application.default application).each do |cfgfile|
   path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
-  confs = ConfigLoader.load(path)
+  confs = ConfigLoader.load(path, erb: true)
   # Ignore empty YAML file:
   next if confs == false
   application_config.deep_merge!(confs['common'] || {})
@@ -185,7 +185,7 @@ end
 db_config = {}
 path = "#{::Rails.root.to_s}/config/database.yml"
 if File.exist? path
-  db_config = ConfigLoader.load(path)
+  db_config = ConfigLoader.load(path, erb: true)
 end
 
 $remaining_config = arvcfg.migrate_config(application_config, $arvados_config)

-----------------------------------------------------------------------


hooks/post-receive
--