diff options
| author | Claudio B <claudiob@users.noreply.github.com> | 2016-01-25 18:51:05 -0800 |
|---|---|---|
| committer | Claudio B <claudiob@users.noreply.github.com> | 2016-01-25 18:51:05 -0800 |
| commit | 35db4603095e8ccc0a92d925a42d4b3d9462580f (patch) | |
| tree | 29030a8d0a0128917b8d0177fdc27633705ea4ad /railties | |
| parent | c48790e4f6d3b733c55e7812f10ccad220ee7f81 (diff) | |
| parent | 6accef4e11b0c793e1c085536b5ed27f32b6a0c3 (diff) | |
| download | rails-35db4603095e8ccc0a92d925a42d4b3d9462580f.tar.gz rails-35db4603095e8ccc0a92d925a42d4b3d9462580f.tar.bz2 rails-35db4603095e8ccc0a92d925a42d4b3d9462580f.zip | |
Merge pull request #23228 from claudiob/no-em
[ci skip] Don’t explicitly mention EventMachine
Diffstat (limited to 'railties')
2 files changed, 2 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 438c84154d..d56fa30f4d 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,4 @@ -# Be sure to restart your server when you modify this file. Action Cable runs in an EventMachine loop that does not support auto reloading. +# 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 965046f3c7..b4f41389ad 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,4 @@ -# Be sure to restart your server when you modify this file. Action Cable runs in an EventMachine loop that does not support auto reloading. +# 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 |