aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record.rb')
-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 fc70b0de68..ddd1f9ff4c 100755
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -54,7 +54,7 @@ require 'active_record/xml_serialization'
ActiveRecord::Base.class_eval do
include ActiveRecord::Validations
- include ActiveRecord::Locking
+ include ActiveRecord::Locking::Optimistic
include ActiveRecord::Callbacks
include ActiveRecord::Observing
include ActiveRecord::Timestamp