aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
diff options
context:
space:
mode:
authorWillian Gustavo Veiga <beberveiga@gmail.com>2018-10-22 20:06:45 -0300
committerWillian Gustavo Veiga <beberveiga@gmail.com>2018-10-22 20:06:45 -0300
commit47ef6fd2ca596a7d47bac6b584d5eced46e0d4d8 (patch)
tree26d0a84a3cefd153b5315c37addb784e1b9228f3 /actioncable
parentc8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397 (diff)
parente853acb9b4cfb5bb91a241cf37084631cd145823 (diff)
downloadrails-47ef6fd2ca596a7d47bac6b584d5eced46e0d4d8.tar.gz
rails-47ef6fd2ca596a7d47bac6b584d5eced46e0d4d8.tar.bz2
rails-47ef6fd2ca596a7d47bac6b584d5eced46e0d4d8.zip
Merge branch 'master' into feature/reselect-method
Diffstat (limited to 'actioncable')
-rw-r--r--actioncable/lib/rails/generators/channel/templates/javascript/index.js.tt4
1 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/lib/rails/generators/channel/templates/javascript/index.js.tt b/actioncable/lib/rails/generators/channel/templates/javascript/index.js.tt
index 5da1ce2dce..0cfcf74919 100644
--- a/actioncable/lib/rails/generators/channel/templates/javascript/index.js.tt
+++ b/actioncable/lib/rails/generators/channel/templates/javascript/index.js.tt
@@ -1,5 +1,5 @@
-// Load all the channels within this directory and all subdirectories.
+// Load all the channels within this directory and all subdirectories.
// Channel files must be named *_channel.js.
-const channels = require.context('.', true, /\_channel\.js$/)
+const channels = require.context('.', true, /_channel\.js$/)
channels.keys().forEach(channels)