aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-xactiverecord/lib/active_record.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index a6169272a1..9d821d17e9 100755
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -49,8 +49,8 @@ require 'active_record/migration'
ActiveRecord::Base.class_eval do
include ActiveRecord::Validations
- include ActiveRecord::Callbacks
include ActiveRecord::Locking
+ include ActiveRecord::Callbacks
include ActiveRecord::Timestamp
include ActiveRecord::Associations
include ActiveRecord::Aggregations