diff options
| author | Aidan Haran <aidanharan@yahoo.com> | 2017-12-09 13:41:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-09 13:41:02 +0000 |
| commit | 66f34a8ea58c8c98d9cc2651d386c9e5a0789d08 (patch) | |
| tree | d24e9014cf9045abc892ba97ac993e2e26e31c7e /railties/lib/rails/app_updater.rb | |
| parent | 3291fa3630c456450f8c6a9b771f77c293d036cd (diff) | |
| parent | 55d4cf2a9c1a6e77ed7aedb866e964039bb4a143 (diff) | |
| download | rails-66f34a8ea58c8c98d9cc2651d386c9e5a0789d08.tar.gz rails-66f34a8ea58c8c98d9cc2651d386c9e5a0789d08.tar.bz2 rails-66f34a8ea58c8c98d9cc2651d386c9e5a0789d08.zip | |
Merge branch 'master' into custom-discarded-job-handling
Diffstat (limited to 'railties/lib/rails/app_updater.rb')
| -rw-r--r-- | railties/lib/rails/app_updater.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/railties/lib/rails/app_updater.rb b/railties/lib/rails/app_updater.rb index c2436a69f9..a076d082d5 100644 --- a/railties/lib/rails/app_updater.rb +++ b/railties/lib/rails/app_updater.rb @@ -21,11 +21,12 @@ module Rails private def generator_options options = { api: !!Rails.application.config.api_only, update: true } - options[:skip_active_record] = !defined?(ActiveRecord::Railtie) - options[:skip_action_mailer] = !defined?(ActionMailer::Railtie) - options[:skip_action_cable] = !defined?(ActionCable::Engine) - options[:skip_sprockets] = !defined?(Sprockets::Railtie) - options[:skip_puma] = !defined?(Puma) + options[:skip_active_record] = !defined?(ActiveRecord::Railtie) + options[:skip_active_storage] = !defined?(ActiveStorage::Engine) || !defined?(ActiveRecord::Railtie) + options[:skip_action_mailer] = !defined?(ActionMailer::Railtie) + options[:skip_action_cable] = !defined?(ActionCable::Engine) + options[:skip_sprockets] = !defined?(Sprockets::Railtie) + options[:skip_puma] = !defined?(Puma) options end end |