aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-06-03 04:15:08 +0930
committerMatthew Draper <matthew@trebex.net>2016-06-03 04:15:08 +0930
commit818397c9a36ac333ea53234df16878d8eea4fdc1 (patch)
tree95f57fc0581031e3453c297aeaa0c5775a671cac /railties
parent2c5a8ba6f6e2e9c9d3ff2f2b5b36fb50e8a34b8b (diff)
parenta8df1bc345bf062e98bda64ef9638f65292c4b56 (diff)
downloadrails-818397c9a36ac333ea53234df16878d8eea4fdc1.tar.gz
rails-818397c9a36ac333ea53234df16878d8eea4fdc1.tar.bz2
rails-818397c9a36ac333ea53234df16878d8eea4fdc1.zip
Merge pull request #25240 from matthewd/reloadable-channels
Properly support reloading for Action Cable channels
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/channel.rb1
-rw-r--r--railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/connection.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/channel.rb b/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/channel.rb
index d56fa30f4d..d672697283 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/channel.rb
+++ b/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/channel.rb
@@ -1,4 +1,3 @@
-# Be sure to restart your server when you modify this file. Action Cable runs in a loop that does not support auto reloading.
module ApplicationCable
class Channel < ActionCable::Channel::Base
end
diff --git a/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/connection.rb b/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/connection.rb
index b4f41389ad..0ff5442f47 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/connection.rb
+++ b/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/connection.rb
@@ -1,4 +1,3 @@
-# Be sure to restart your server when you modify this file. Action Cable runs in a loop that does not support auto reloading.
module ApplicationCable
class Connection < ActionCable::Connection::Base
end