Skip to content

Commit 296ac75

Browse files
committed
Pass App::UpdateCommand options to AppGenerator
1 parent 8bb0d9c commit 296ac75

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

railties/lib/rails/commands/app/update_command.rb

+17-15
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,23 @@ def app_generator
4848
end
4949

5050
def generator_options
51-
options = { api: !!Rails.application.config.api_only, update: true }
52-
options[:name] = Rails.application.class.name.chomp("::Application").underscore
53-
options[:skip_active_job] = !defined?(ActiveJob::Railtie)
54-
options[:skip_active_record] = !defined?(ActiveRecord::Railtie)
55-
options[:skip_active_storage] = !defined?(ActiveStorage::Engine)
56-
options[:skip_action_mailer] = !defined?(ActionMailer::Railtie)
57-
options[:skip_action_mailbox] = !defined?(ActionMailbox::Engine)
58-
options[:skip_action_text] = !defined?(ActionText::Engine)
59-
options[:skip_action_cable] = !defined?(ActionCable::Engine)
60-
options[:skip_test] = !defined?(Rails::TestUnitRailtie)
61-
options[:skip_system_test] = Rails.application.config.generators.system_tests.nil?
62-
options[:asset_pipeline] = asset_pipeline
63-
options[:skip_asset_pipeline] = asset_pipeline.nil?
64-
options[:skip_bootsnap] = !defined?(Bootsnap)
65-
options
51+
{
52+
api: !!Rails.application.config.api_only,
53+
update: true,
54+
name: Rails.application.class.name.chomp("::Application").underscore,
55+
skip_active_job: !defined?(ActiveJob::Railtie),
56+
skip_active_record: !defined?(ActiveRecord::Railtie),
57+
skip_active_storage: !defined?(ActiveStorage::Engine),
58+
skip_action_mailer: !defined?(ActionMailer::Railtie),
59+
skip_action_mailbox: !defined?(ActionMailbox::Engine),
60+
skip_action_text: !defined?(ActionText::Engine),
61+
skip_action_cable: !defined?(ActionCable::Engine),
62+
skip_test: !defined?(Rails::TestUnitRailtie),
63+
skip_system_test: Rails.application.config.generators.system_tests.nil?,
64+
asset_pipeline: asset_pipeline,
65+
skip_asset_pipeline: asset_pipeline.nil?,
66+
skip_bootsnap: !defined?(Bootsnap),
67+
}.merge(options)
6668
end
6769

6870
def asset_pipeline

0 commit comments

Comments
 (0)