[ARVADOS] created: 9a26fa413d0890eac3a2578876508efc2cd32374

[Git user]

        at  9a26fa413d0890eac3a2578876508efc2cd32374 (commit)


commit 9a26fa413d0890eac3a2578876508efc2cd32374
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Wed Aug 16 13:07:32 2017 -0400

    Workbench shouldn't error out when config files are missing if
    RAILS_GROUP is set and includes 'assets'.
    
    refs #12122
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/apps/workbench/config/load_config.rb b/apps/workbench/config/load_config.rb
index 441a437..d8d4dff 100644
--- a/apps/workbench/config/load_config.rb
+++ b/apps/workbench/config/load_config.rb
@@ -46,8 +46,9 @@ EOS
       cfg.send "#{k}=", v
     end
   end
-  if !nils.empty?
+  if !nils.empty? and not ::Rails.groups.include?('assets')
     raise <<EOS
+#{::Rails.groups.include?('assets')}
 Refusing to start in #{::Rails.env.to_s} mode with missing configuration.
 
 The following configuration settings must be specified in
@@ -57,7 +58,7 @@ config/application.yml:
 EOS
   end
   # Refuse to start if keep-web isn't configured
-  if not (config.keep_web_url or config.keep_web_download_url)
+  if not (config.keep_web_url or config.keep_web_download_url) and not ::Rails.groups.include?('assets')
     raise <<EOS
 Refusing to start in #{::Rails.env.to_s} mode with missing configuration.
 

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


hooks/post-receive
--