aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorKoen Punt <koen@koenpunt.nl>2016-03-14 22:01:41 +0100
committerKoen Punt <koen@koenpunt.nl>2016-03-23 14:13:13 +0100
commite270bb586eda3ff65ce47039c043570e5ab3e8a4 (patch)
tree2816d5f4f025603b9c40c4ecaa019402b724a3bc /railties/lib/rails
parentc519d1c2ef28f42342ca4446b8211770b4f551cb (diff)
downloadrails-e270bb586eda3ff65ce47039c043570e5ab3e8a4.tar.gz
rails-e270bb586eda3ff65ce47039c043570e5ab3e8a4.tar.bz2
rails-e270bb586eda3ff65ce47039c043570e5ab3e8a4.zip
Add ActionCable require statement to plugin
When generating a plugin without ActiveRecord (-O), ActionCable wasn't include, which causes problems with the require action_cable statement in cable.js add active_job require statement also updated order of require statements to match with all.rb
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/plugin/templates/rails/application.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb b/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb
index d71a021bd2..d03b1be878 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb
+++ b/railties/lib/rails/generators/rails/plugin/templates/rails/application.rb
@@ -6,10 +6,12 @@ require 'rails/all'
# Pick the frameworks you want:
<%= comment_if :skip_active_record %>require "active_record/railtie"
require "action_controller/railtie"
-<%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
require "action_view/railtie"
-<%= comment_if :skip_sprockets %>require "sprockets/railtie"
+<%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
+require "active_job/railtie"
+<%= comment_if :skip_action_cable %>require "action_cable/engine"
<%= comment_if :skip_test %>require "rails/test_unit/railtie"
+<%= comment_if :skip_sprockets %>require "sprockets/railtie"
<% end -%>
Bundler.require(*Rails.groups)