From 4866399054c9facf11bc743c0e0969e6c81f6c31 Mon Sep 17 00:00:00 2001
From: Lucas Mazza <lucastmazza@gmail.com>
Date: Tue, 22 Apr 2014 23:37:13 -0500
Subject: `ActiveRecord::Base.no_touching` no longer triggers callbacks or
 start empty transactions.

Closes #14841.
---
 activerecord/lib/active_record/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib')

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
-- 
cgit v1.2.3