diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-01-28 15:25:31 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-01-30 03:46:37 +1030 |
| commit | 74497eabd52f2f9f8c383808b11286283046c2b2 (patch) | |
| tree | fe2b2cb0d7c4066449fc7e0426d49cad0d2f91e6 /railties/lib/rails/generators | |
| parent | c8818dfcdf9e92364745000eefe46132a43f8700 (diff) | |
| download | rails-74497eabd52f2f9f8c383808b11286283046c2b2.tar.gz rails-74497eabd52f2f9f8c383808b11286283046c2b2.tar.bz2 rails-74497eabd52f2f9f8c383808b11286283046c2b2.zip | |
Revert "Revert "Eliminate the EventMachine dependency""
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config.ru.tt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru.tt b/railties/lib/rails/generators/rails/app/templates/config.ru.tt index 70556fcc99..343c0833d7 100644 --- a/railties/lib/rails/generators/rails/app/templates/config.ru.tt +++ b/railties/lib/rails/generators/rails/app/templates/config.ru.tt @@ -3,9 +3,8 @@ require ::File.expand_path('../config/environment', __FILE__) <%- unless options[:skip_action_cable] -%> -# Action Cable uses EventMachine which requires that all classes are loaded in advance +# Action Cable requires that all classes are loaded in advance Rails.application.eager_load! -require 'action_cable/process/logging' <%- end -%> run Rails.application |