diff options
| -rw-r--r-- | actioncable/lib/action_cable/railtie.rb (renamed from actioncable/lib/action_cable/engine.rb) | 10 | ||||
| -rw-r--r-- | railties/lib/rails/all.rb | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/actioncable/lib/action_cable/engine.rb b/actioncable/lib/action_cable/railtie.rb index 071dcd73e4..a1a656f790 100644 --- a/actioncable/lib/action_cable/engine.rb +++ b/actioncable/lib/action_cable/railtie.rb @@ -1,11 +1,11 @@ -require 'rails/engine' -require 'action_cable' -require 'active_support/ordered_options' -require 'action_cable/helpers/action_cable_helper' +require "rails" +require "action_cable" +require "action_cable/helpers/action_cable_helper" module ActionCable - class Engine < ::Rails::Engine + class Railtie < Rails::Railtie # :nodoc: config.action_cable = ActiveSupport::OrderedOptions.new + config.eager_load_namespaces << ActionCable initializer "action_cable.helpers" do ActiveSupport.on_load(:action_view) do diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb index 11f4d5c4bc..959c003e00 100644 --- a/railties/lib/rails/all.rb +++ b/railties/lib/rails/all.rb @@ -6,7 +6,7 @@ require "rails" action_view/railtie action_mailer/railtie active_job/railtie - action_cable/engine + action_cable/railtie rails/test_unit/railtie sprockets/railtie ).each do |railtie| |