aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rw-r--r--activerecord/lib/active_record/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 0b788ea1f9..662c99269e 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -308,10 +308,10 @@ module ActiveRecord #:nodoc:
include Integration
include Validations
include CounterCache
- include Locking::Optimistic
- include Locking::Pessimistic
include Attributes
include AttributeDecorators
+ include Locking::Optimistic
+ include Locking::Pessimistic
include AttributeMethods
include Callbacks
include Timestamp