diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-07-16 07:07:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-16 07:07:27 +0200 |
| commit | 1766e8e6ff9133b8254937791d48eedf2a3f7864 (patch) | |
| tree | 64eaf145db921dfae9ecf6df050810ccefe135c9 /railties/lib/rails/generators | |
| parent | 6f9c55f820877608528e1380881df4b0f0a2dfe7 (diff) | |
| parent | 5803640261a324bd7d7665a2bad5b5dc6da29255 (diff) | |
| download | rails-1766e8e6ff9133b8254937791d48eedf2a3f7864.tar.gz rails-1766e8e6ff9133b8254937791d48eedf2a3f7864.tar.bz2 rails-1766e8e6ff9133b8254937791d48eedf2a3f7864.zip | |
Merge pull request #29645 from y-yagi/check_component_when_run_app_update
Do not generate unused components contents in `app:update` task
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 7614e6304b..7a59f106e3 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -128,7 +128,7 @@ module Rails gsub_file "config/initializers/cookies_serializer.rb", /json(?!,)/, "marshal" end - unless action_cable_config_exist + if !options[:skip_action_cable] && !action_cable_config_exist template "config/cable.yml" end |