diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-12-22 17:12:03 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-12-22 17:12:03 +1030 |
| commit | b5049bc995b09041548da75ec368d9f2753eb024 (patch) | |
| tree | 5fddd70ec71a3d59ca126547343011168ed9b431 /railties | |
| parent | 17a4e450489a785af53d3e11f5a35ec1e8ea0903 (diff) | |
| parent | a859108c82cc96329fabf4f2488cec4ee77852df (diff) | |
| download | rails-b5049bc995b09041548da75ec368d9f2753eb024.tar.gz rails-b5049bc995b09041548da75ec368d9f2753eb024.tar.bz2 rails-b5049bc995b09041548da75ec368d9f2753eb024.zip | |
Merge pull request #22753 from gwincr11/keeps-options-breaks-assets
Fix .keep file issue with ActionCable
Diffstat (limited to 'railties')
| -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 0819e6c01f..16efa96207 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -57,7 +57,7 @@ module Rails directory 'app' keep_file 'app/assets/images' - keep_file 'app/assets/javascripts/channels' unless options[:skip_action_cable] + empty_directory_with_keep_file 'app/assets/javascripts/channels' unless options[:skip_action_cable] keep_file 'app/controllers/concerns' keep_file 'app/models/concerns' |