diff options
| author | Cory Gwin <gwincr11@yahoo.com> | 2015-12-21 21:41:00 -0800 |
|---|---|---|
| committer | Cory Gwin <gwincr11@yahoo.com> | 2015-12-21 21:41:00 -0800 |
| commit | a859108c82cc96329fabf4f2488cec4ee77852df (patch) | |
| tree | 479db1fc94e3172c3a19fcd50b1c3e52505d5d99 /railties | |
| parent | 043660249bd8587194202cf4440fb1fd9db109a4 (diff) | |
| download | rails-a859108c82cc96329fabf4f2488cec4ee77852df.tar.gz rails-a859108c82cc96329fabf4f2488cec4ee77852df.tar.bz2 rails-a859108c82cc96329fabf4f2488cec4ee77852df.zip | |
Fix .keep file issue with ActionCable
Fixes #22708
Make sure the channels file is create in assets/javascript/ so require
tree works in asset pipeline.
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 44bbc478d0..05249f7582 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' |