diff options
author | Richard Schneeman <richard.schneeman@gmail.com> | 2015-08-08 16:48:11 -0500 |
---|---|---|
committer | Richard Schneeman <richard.schneeman@gmail.com> | 2015-08-08 16:48:11 -0500 |
commit | aeaf32e1b39b9f78f8abda2bfa208c883d64135b (patch) | |
tree | 8edb3e0e61eecd51e60fbb02bba9720d28ab2b37 /activerecord/lib/active_record/railtie.rb | |
parent | 6e21494ac66897f9a3c5f1f6f4ec6f2c9a628c8e (diff) | |
parent | 468cdfcc8516bf9f0d990bcf11b785875c57b286 (diff) | |
download | rails-aeaf32e1b39b9f78f8abda2bfa208c883d64135b.tar.gz rails-aeaf32e1b39b9f78f8abda2bfa208c883d64135b.tar.bz2 rails-aeaf32e1b39b9f78f8abda2bfa208c883d64135b.zip |
Merge pull request #21175 from gringocl/middleware-deprecations
Reference actual classes
Diffstat (limited to 'activerecord/lib/active_record/railtie.rb')
-rw-r--r-- | activerecord/lib/active_record/railtie.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index da6b8447d3..459d6256fa 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -16,11 +16,11 @@ module ActiveRecord config.app_generators.orm :active_record, :migration => true, :timestamps => true - config.app_middleware.insert_after "::ActionDispatch::Callbacks", - "ActiveRecord::QueryCache" + config.app_middleware.insert_after ::ActionDispatch::Callbacks, + ActiveRecord::QueryCache - config.app_middleware.insert_after "::ActionDispatch::Callbacks", - "ActiveRecord::ConnectionAdapters::ConnectionManagement" + config.app_middleware.insert_after ::ActionDispatch::Callbacks, + ActiveRecord::ConnectionAdapters::ConnectionManagement config.action_dispatch.rescue_responses.merge!( 'ActiveRecord::RecordNotFound' => :not_found, @@ -78,7 +78,7 @@ module ActiveRecord initializer "active_record.migration_error" do if config.active_record.delete(:migration_error) == :page_load - config.app_middleware.insert_after "::ActionDispatch::Callbacks", + config.app_middleware.insert_after ::ActionDispatch::Callbacks, "ActiveRecord::Migration::CheckPending" end end |