aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/locking/optimistic.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/locking/optimistic.rb')
-rw-r--r--activerecord/lib/active_record/locking/optimistic.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb
index b80d01db81..e643c0d437 100644
--- a/activerecord/lib/active_record/locking/optimistic.rb
+++ b/activerecord/lib/active_record/locking/optimistic.rb
@@ -48,7 +48,10 @@ module ActiveRecord
module Optimistic
extend ActiveSupport::Concern
- Configuration.define :lock_optimistically, true
+ included do
+ config_attribute :lock_optimistically, :global => true
+ self.lock_optimistically = true
+ end
def locking_enabled? #:nodoc:
self.class.locking_enabled?