diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-16 15:52:46 +0100 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-16 15:52:46 +0100 |
commit | 51ad57989d3e2afb5b297edc7e6c997a41196559 (patch) | |
tree | e1e676efe5951e3cdfc9cb94e935854604aa81d5 | |
parent | 6bfd191c0f8005fcb4c140f77567e17c189ba238 (diff) | |
download | rails-51ad57989d3e2afb5b297edc7e6c997a41196559.tar.gz rails-51ad57989d3e2afb5b297edc7e6c997a41196559.tar.bz2 rails-51ad57989d3e2afb5b297edc7e6c997a41196559.zip |
Doh, should have read ff370ee61754b00f864f3ddd0af62be4dfa0de67
Indeed we need this to be an engine for the internal assets to work
-rw-r--r-- | actioncable/lib/action_cable/engine.rb (renamed from actioncable/lib/action_cable/railtie.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/all.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/lib/action_cable/railtie.rb b/actioncable/lib/action_cable/engine.rb index 7135b75d69..e62413e9e3 100644 --- a/actioncable/lib/action_cable/railtie.rb +++ b/actioncable/lib/action_cable/engine.rb @@ -4,7 +4,7 @@ require "action_cable/helpers/action_cable_helper" require "active_support/core_ext/hash/indifferent_access" module ActionCable - class Railtie < Rails::Railtie # :nodoc: + class Railtie < Rails::Engine # :nodoc: config.action_cable = ActiveSupport::OrderedOptions.new config.eager_load_namespaces << ActionCable diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb index 959c003e00..11f4d5c4bc 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/railtie + action_cable/engine rails/test_unit/railtie sprockets/railtie ).each do |railtie| |