Merge branch '15295-keep-ref-check' closes #15295

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

diff --git a/apps/workbench/config/application.rb b/apps/workbench/config/application.rb
index 891dd432c0dccfedf4f773cd41748c0222124e88..1c7a9d0dac8866511f795e1fea048d7f4989a300 100644 (file)
--- a/apps/workbench/config/application.rb
+++ b/apps/workbench/config/application.rb
@@ -4,7 +4,18 @@
 
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+require "rails"
+# Pick only the frameworks we need:
+require "active_model/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+# Skip ActionCable (new in Rails 5.0) as it adds '/cable' routes that we're not using
+# require "action_cable/engine"
+require "sprockets/railtie"
+require "rails/test_unit/railtie"
 
 Bundler.require(:default, Rails.env)
 
@@ -15,8 +26,9 @@ module ArvadosWorkbench
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
+    # Autoload paths shouldn't be used anymore since Rails 5.0
+    # See #15258 and https://github.com/rails/rails/issues/13142#issuecomment-74586224
     # config.autoload_paths += %W(#{config.root}/extras)
-    config.autoload_paths += %W(#{config.root}/lib)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.