[ARVADOS] updated: caa9e89d531f03838e64d36d050be9d96e7c6c96

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/config/load_config.rb            | 12 +++++++++---
 services/api/config/initializers/load_config.rb | 12 +++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

       via  caa9e89d531f03838e64d36d050be9d96e7c6c96 (commit)
       via  1d5e009a31e0b462b7bfcf4c0e5dc36db423c90f (commit)
      from  61187968f0e9268430b967ce37a79d9384ec7e3c (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 caa9e89d531f03838e64d36d050be9d96e7c6c96
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jul 20 10:34:13 2015 -0400

    Revert "6362: Allow config/application.yml to override environments/*.rb in apiserver, too."
    
    In Rails 3 (actionpack 3.2.17), changing asset configuration to
    production settings in load_config.rb breaks the rake
    assets:precompile task, e.g., the docker build. This change is still
    desired but needs to be backed out until the bugs are worked out.
    
    This reverts commit c790738ae71771a5574b166b3e93a1bca9b89bf6.
    
    refs #6362

diff --git a/services/api/config/initializers/load_config.rb b/services/api/config/initializers/load_config.rb
index cb31a24..de9770d 100644
--- a/services/api/config/initializers/load_config.rb
+++ b/services/api/config/initializers/load_config.rb
@@ -46,17 +46,11 @@ Server::Application.configure do
     ks.each do |kk|
       cfg = cfg.send(kk)
     end
-    if v.nil? and cfg.respond_to?(k) and !cfg.send(k).nil?
-      # Config is nil in *.yml, but has been set already in
-      # environments/*.rb (or has a Rails default). Don't overwrite
-      # the default/upstream config with nil.
+    if cfg.respond_to?(k.to_sym) and !cfg.send(k).nil?
+      # Config must have been set already in environments/*.rb.
       #
       # After config files have been migrated, this mechanism should
-      # be removed.
-      Rails.logger.warn <<EOS
-DEPRECATED: Inheriting config.#{ks.join '.'} from Rails config.
-            Please move this config into config/application.yml.
-EOS
+      # be deprecated, then removed.
     elsif v.nil?
       # Config variables are not allowed to be nil. Make a "naughty"
       # list, and present it below.

commit 1d5e009a31e0b462b7bfcf4c0e5dc36db423c90f
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jul 20 10:33:34 2015 -0400

    Revert "Revert "6362: Change config precedence order.""
    
    This reverts commit 61187968f0e9268430b967ce37a79d9384ec7e3c.
    
    Wrong commit reverted.
    
    refs #6362

diff --git a/apps/workbench/config/load_config.rb b/apps/workbench/config/load_config.rb
index 51fc81a..f14c3ca 100644
--- a/apps/workbench/config/load_config.rb
+++ b/apps/workbench/config/load_config.rb
@@ -23,11 +23,17 @@ ArvadosWorkbench::Application.configure do
     ks.each do |kk|
       cfg = cfg.send(kk)
     end
-    if cfg.respond_to?(k.to_sym) and !cfg.send(k).nil?
-      # Config must have been set already in environments/*.rb.
+    if v.nil? and cfg.respond_to?(k) and !cfg.send(k).nil?
+      # Config is nil in *.yml, but has been set already in
+      # environments/*.rb (or has a Rails default). Don't overwrite
+      # the default/upstream config with nil.
       #
       # After config files have been migrated, this mechanism should
-      # be deprecated, then removed.
+      # be removed.
+      Rails.logger.warn <<EOS
+DEPRECATED: Inheriting config.#{ks.join '.'} from Rails config.
+            Please move this config into config/application.yml.
+EOS
     elsif v.nil?
       # Config variables are not allowed to be nil. Make a "naughty"
       # list, and present it below.

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


hooks/post-receive
--