diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-12-23 21:37:52 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-12-24 11:08:15 +0000 |
| commit | ba7ec73f6a5c98c008e8e48eb06e9b9a17a91991 (patch) | |
| tree | 32501c519056e017537da0c80c9a8e787cb211b4 /activerecord/lib/active_record/locking/optimistic.rb | |
| parent | 8c67e709d0b2946473af84959deaac0ced962d5e (diff) | |
| download | rails-ba7ec73f6a5c98c008e8e48eb06e9b9a17a91991.tar.gz rails-ba7ec73f6a5c98c008e8e48eb06e9b9a17a91991.tar.bz2 rails-ba7ec73f6a5c98c008e8e48eb06e9b9a17a91991.zip | |
Deal with global config better between AR::Base and AR::Model
Diffstat (limited to 'activerecord/lib/active_record/locking/optimistic.rb')
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index 27267c9d38..b80d01db81 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -48,10 +48,7 @@ module ActiveRecord module Optimistic extend ActiveSupport::Concern - included do - cattr_accessor :lock_optimistically, :instance_writer => false - self.lock_optimistically = true - end + Configuration.define :lock_optimistically, true def locking_enabled? #:nodoc: self.class.locking_enabled? |