diff options
| author | bogdanvlviv <bogdanvlviv@gmail.com> | 2017-08-06 20:41:31 +0000 |
|---|---|---|
| committer | bogdanvlviv <bogdanvlviv@gmail.com> | 2017-11-06 21:08:51 +0000 |
| commit | 4a835aa3236eedb135ccf8b59ed3c03e040b8b01 (patch) | |
| tree | 32ae1bb999ececbe5673ff8e9b320c760aa71570 /railties/lib/rails/app_updater.rb | |
| parent | aa6bcbbac8517d5b077f21073e9902637d7c7157 (diff) | |
| download | rails-4a835aa3236eedb135ccf8b59ed3c03e040b8b01.tar.gz rails-4a835aa3236eedb135ccf8b59ed3c03e040b8b01.tar.bz2 rails-4a835aa3236eedb135ccf8b59ed3c03e040b8b01.zip | |
Add --skip-active-storage and do so automatically when --skip-active-record is used
Closes #30102
Revert part 787fe90dc0a7c5b91bb5af51f2858ea8c4676268
--skip-active-storage pass throughs `rails plugin new`
Add changelog entry about default initialization of Active Storage
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 |