From a859108c82cc96329fabf4f2488cec4ee77852df Mon Sep 17 00:00:00 2001
From: Cory Gwin <gwincr11@yahoo.com>
Date: Mon, 21 Dec 2015 21:41:00 -0800
Subject: [PATCH] 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.

---
 railties/lib/rails/generators/rails/app/app_generator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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'