aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/app_updater.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-11-06 17:25:54 -0500
committerGitHub <noreply@github.com>2017-11-06 17:25:54 -0500
commit63f0c04850dd0bcdc7d35266e81fa1a7778570a8 (patch)
tree86df79ca9d7d2508e3d75d3ee4fd4e147b30278b /railties/lib/rails/app_updater.rb
parent256a44c4398a5cd268dbcd8ea4171210b6fe7230 (diff)
parentcb8553c95d345e40b448cf8e10aa033ff0ede4f2 (diff)
downloadrails-63f0c04850dd0bcdc7d35266e81fa1a7778570a8.tar.gz
rails-63f0c04850dd0bcdc7d35266e81fa1a7778570a8.tar.bz2
rails-63f0c04850dd0bcdc7d35266e81fa1a7778570a8.zip
Merge pull request #30101 from bogdanvlviv/initialization-active_storage
Provide initialization of Active Storage
Diffstat (limited to 'railties/lib/rails/app_updater.rb')
-rw-r--r--railties/lib/rails/app_updater.rb11
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