16314: Search both user and tmp paths for gems.

[arvados.git] / apps / workbench / config / application.rb

diff --git a/apps/workbench/config/application.rb b/apps/workbench/config/application.rb
index da33c2f97b3f815bdf6dc484a658325d5d0adadf..e88229b85158f200ebc6a7df644f9b147fcfd06f 100644 (file)
--- a/apps/workbench/config/application.rb
+++ b/apps/workbench/config/application.rb
@@ -19,6 +19,10 @@ require "rails/test_unit/railtie"
 
 Bundler.require(:default, Rails.env)
 
+if ENV["ARVADOS_RAILS_LOG_TO_STDOUT"]
+  Rails.logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+end
+
 module ArvadosWorkbench
   class Application < Rails::Application
 
@@ -74,5 +78,3 @@ module ArvadosWorkbench
     config.assets.paths << Rails.root.join('node_modules')
   end
 end
-
-require File.expand_path('../load_config', __FILE__)