diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-11-08 16:57:15 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 16:57:15 +0900 |
| commit | b83df6e1a331104b18b3f005ea5b9cbb803dfe8f (patch) | |
| tree | 9bbf0eb6c9d53ba5e2841d9a4656ff3a4d6df362 /railties/lib | |
| parent | daf77db65d9d5e295ee3ba86605988875cb834e4 (diff) | |
| parent | 8e1dca10cd98bdc8bb00592f3d90926309b22a18 (diff) | |
| download | rails-b83df6e1a331104b18b3f005ea5b9cbb803dfe8f.tar.gz rails-b83df6e1a331104b18b3f005ea5b9cbb803dfe8f.tar.bz2 rails-b83df6e1a331104b18b3f005ea5b9cbb803dfe8f.zip | |
Merge pull request #31084 from y-yagi/do_not_run_active_storage_install_when_bundle_install_is_skipped
Do not run active storage install when bundle install is skipped
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 59ca4c849f..60e54cc365 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -461,7 +461,11 @@ module Rails def run_active_storage unless skip_active_storage? - rails_command "active_storage:install", capture: options[:quiet] + if bundle_install? + rails_command "active_storage:install", capture: options[:quiet] + else + log("Active Storage installation was skipped. Please run 'bin/rails active_storage:install' to install Active Storage files.") + end end end |