diff options
| author | Richard Schneeman <richard.schneeman@gmail.com> | 2015-12-18 23:00:08 -0600 |
|---|---|---|
| committer | Richard Schneeman <richard.schneeman@gmail.com> | 2015-12-18 23:00:08 -0600 |
| commit | bf42c91c75a4cace83c04afcebd0705c504794db (patch) | |
| tree | 9500e0bfc6e8b85296a17acf28f6041d982d0009 /railties | |
| parent | 0338cabbc901f645b127efe4818851affece2757 (diff) | |
| parent | 70040184ab693e1632802da59518b9c2424aff47 (diff) | |
| download | rails-bf42c91c75a4cace83c04afcebd0705c504794db.tar.gz rails-bf42c91c75a4cace83c04afcebd0705c504794db.tar.bz2 rails-bf42c91c75a4cace83c04afcebd0705c504794db.zip | |
Merge pull request #22690 from claudiob/remove-blank-line
Remove blank line generated in config.ru
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config.ru.tt | 2 |
1 files changed, 1 insertions, 1 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 3a279ffcc0..70556fcc99 100644 --- a/railties/lib/rails/generators/rails/app/templates/config.ru.tt +++ b/railties/lib/rails/generators/rails/app/templates/config.ru.tt @@ -1,8 +1,8 @@ # This file is used by Rack-based servers to start the application. 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 Rails.application.eager_load! require 'action_cable/process/logging' |