aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/locking.rb
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-04-29 18:10:14 +0000
committerMarcel Molina <marcel@vernix.org>2006-04-29 18:10:14 +0000
commit61864909628f5ac2f20d3337e0274dab016ac7c5 (patch)
tree86a8cc11110b1009f23fe0c72a6138f8ac45d31a /activerecord/lib/active_record/locking.rb
parentdf26041c8990d4a0276e7a4c77cc771ac38e176e (diff)
downloadrails-61864909628f5ac2f20d3337e0274dab016ac7c5.tar.gz
rails-61864909628f5ac2f20d3337e0274dab016ac7c5.tar.bz2
rails-61864909628f5ac2f20d3337e0274dab016ac7c5.zip
Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4310 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/locking.rb')
-rw-r--r--activerecord/lib/active_record/locking.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/locking.rb b/activerecord/lib/active_record/locking.rb
index ca83a98b30..3e0c47e706 100644
--- a/activerecord/lib/active_record/locking.rb
+++ b/activerecord/lib/active_record/locking.rb
@@ -21,8 +21,7 @@ module ActiveRecord
# To override the name of the lock_version column, invoke the <tt>set_locking_column</tt> method.
# This method uses the same syntax as <tt>set_table_name</tt>
module Locking
- def self.append_features(base) #:nodoc:
- super
+ def self.included(base) #:nodoc:
base.class_eval do
alias_method :update_without_lock, :update
alias_method :update, :update_with_lock