[ARVADOS] updated: c790738ae71771a5574b166b3e93a1bca9b89bf6

[git at public.curoverse.com]

Summary of changes:
 services/api/config/initializers/load_config.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

       via  c790738ae71771a5574b166b3e93a1bca9b89bf6 (commit)
      from  ed8897b942f147afccf8eeac1025861ffe2f1690 (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 c790738ae71771a5574b166b3e93a1bca9b89bf6
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jul 15 16:24:47 2015 -0400

    6362: Allow config/application.yml to override environments/*.rb in apiserver, too.

diff --git a/services/api/config/initializers/load_config.rb b/services/api/config/initializers/load_config.rb
index de9770d..cb31a24 100644
--- a/services/api/config/initializers/load_config.rb
+++ b/services/api/config/initializers/load_config.rb
@@ -46,11 +46,17 @@ Server::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
--