diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-14 14:31:30 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-14 14:31:30 -0200 |
commit | 3cf7b3056462562b0f9ce45a2691aa32cc54636e (patch) | |
tree | ecac007aa2eb1ab94398a3d37f606a3611eb842a /railties/lib | |
parent | 2e701a04d45424a2d2a1ae561262ff5c44bc2cc6 (diff) | |
download | rails-3cf7b3056462562b0f9ce45a2691aa32cc54636e.tar.gz rails-3cf7b3056462562b0f9ce45a2691aa32cc54636e.tar.bz2 rails-3cf7b3056462562b0f9ce45a2691aa32cc54636e.zip |
Add action_cable to rails/all and application.rb
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/all.rb | 19 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 1 |
2 files changed, 11 insertions, 9 deletions
diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb index 45361fca83..11f4d5c4bc 100644 --- a/railties/lib/rails/all.rb +++ b/railties/lib/rails/all.rb @@ -1,16 +1,17 @@ require "rails" %w( - active_record - action_controller - action_view - action_mailer - active_job - rails/test_unit - sprockets -).each do |framework| + active_record/railtie + action_controller/railtie + action_view/railtie + action_mailer/railtie + active_job/railtie + action_cable/engine + rails/test_unit/railtie + sprockets/railtie +).each do |railtie| begin - require "#{framework}/railtie" + require "#{railtie}" rescue LoadError end end diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index ddd0fcade1..6bb649af8e 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -11,6 +11,7 @@ require "active_job/railtie" require "action_controller/railtie" <%= comment_if :skip_action_mailer %>require "action_mailer/railtie" require "action_view/railtie" +require "action_cable/engine" <%= comment_if :skip_sprockets %>require "sprockets/railtie" <%= comment_if :skip_test %>require "rails/test_unit/railtie" <% end -%> |