diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-01-30 04:21:16 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-01-30 04:21:16 +1030 |
| commit | 703ddadafee29c86ca5be499a80802fbea70a64f (patch) | |
| tree | fd7558a9a27970c7d494a6768bac25361a808cd6 /railties | |
| parent | c8818dfcdf9e92364745000eefe46132a43f8700 (diff) | |
| parent | 4d01cd1545a00ed6f96d6cb658a590afd36e1871 (diff) | |
| download | rails-703ddadafee29c86ca5be499a80802fbea70a64f.tar.gz rails-703ddadafee29c86ca5be499a80802fbea70a64f.tar.bz2 rails-703ddadafee29c86ca5be499a80802fbea70a64f.zip | |
Merge pull request #23305 from matthewd/concurrent-take-2
EventMachine -> concurrent-ruby, take two
Diffstat (limited to 'railties')
| -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 |