aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
authorLucas Mazza <lucastmazza@gmail.com>2014-04-22 23:37:13 -0500
committerLucas Mazza <lucastmazza@gmail.com>2014-04-23 13:07:14 -0500
commit4866399054c9facf11bc743c0e0969e6c81f6c31 (patch)
treecd72a19b3b5f18894086e179461ecdadd0527d19 /activerecord/lib/active_record/base.rb
parentd10e2ca9f199105849444b39f55d4922339d9c8d (diff)
downloadrails-4866399054c9facf11bc743c0e0969e6c81f6c31.tar.gz
rails-4866399054c9facf11bc743c0e0969e6c81f6c31.tar.bz2
rails-4866399054c9facf11bc743c0e0969e6c81f6c31.zip
`ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty transactions.
Closes #14841.
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rw-r--r--activerecord/lib/active_record/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 1d47cba234..db4d5f0129 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -296,7 +296,6 @@ module ActiveRecord #:nodoc:
include Core
include Persistence
- include NoTouching
include ReadonlyAttributes
include ModelSchema
include Inheritance
@@ -318,6 +317,7 @@ module ActiveRecord #:nodoc:
include NestedAttributes
include Aggregations
include Transactions
+ include NoTouching
include Reflection
include Serialization
include Store