From 787fe90dc0a7c5b91bb5af51f2858ea8c4676268 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 4 Aug 2017 11:57:51 -0500 Subject: Include active_storage in all generated application.rb files And deal with a temporary test fix until we allow you to skip active storage. --- railties/lib/rails/generators/rails/app/templates/config/application.rb | 1 + .../lib/rails/generators/rails/plugin/templates/rails/application.rb | 1 + 2 files changed, 2 insertions(+) (limited to 'railties/lib') diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index 0b1d22228e..9931709d7b 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -11,6 +11,7 @@ require "active_job/railtie" require "action_controller/railtie" <%= comment_if :skip_action_mailer %>require "action_mailer/railtie" require "action_view/railtie" +require "active_storage/engine" <%= comment_if :skip_action_cable %>require "action_cable/engine" <%= comment_if :skip_sprockets %>require "sprockets/railtie" <%= comment_if :skip_test %>require "rails/test_unit/railtie" diff --git a/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb b/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb index d03b1be878..5e0cfd6c21 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb +++ b/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb @@ -9,6 +9,7 @@ require "action_controller/railtie" require "action_view/railtie" <%= comment_if :skip_action_mailer %>require "action_mailer/railtie" require "active_job/railtie" +require "active_storage/engine" <%= comment_if :skip_action_cable %>require "action_cable/engine" <%= comment_if :skip_test %>require "rails/test_unit/railtie" <%= comment_if :skip_sprockets %>require "sprockets/railtie" -- cgit v1.2.3