kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Use rails_command :inline option

Browse source 
Follow-up to #37516.
This commit is contained in:
Jonathan Hefner 2020-02-10 17:52:22 -06:00
parent 5613b37b26
commit f6f51632e8
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
actiontext/lib/generators/action_text/install/install_generator.rb
View file

@ -9,7 +9,7 @@ module ActionText
source_root File.expand_path("templates", __dir__)
def install_javascript_dependencies
rails_command "app:update:bin"
rails_command "app:update:bin", inline: true
say "Installing JavaScript dependencies", :green
run "yarn add #{js_dependencies.map { |name, version| "#{name}@#{version}" }.join(" ")}",
@ -49,7 +49,7 @@ module ActionText
end
def create_migrations
rails_command "railties:install:migrations FROM=active_storage,action_text"
rails_command "railties:install:migrations FROM=active_storage,action_text", inline: true
end
hook_for :test_framework

6
railties/lib/rails/generators/app_base.rb
View file

@ -409,8 +409,10 @@ module Rails
def run_webpack
if webpack_install?
rails_command "webpacker:install"
rails_command "webpacker:install:#{options[:webpack]}" if options[:webpack] && options[:webpack] != "webpack"
rails_command "webpacker:install", inline: true
if options[:webpack] && options[:webpack] != "webpack"
rails_command "webpacker:install:#{options[:webpack]}", inline: true
end
end
end

2
railties/lib/rails/generators/rails/app/app_generator.rb
View file

@ -316,7 +316,7 @@ module Rails
def update_active_storage
unless skip_active_storage?
rails_command "active_storage:update"
rails_command "active_storage:update", inline: true
end
end
remove_task :update_active_storage