aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/transactions.rb
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2010-10-14 21:27:40 -0700
committerCarl Lerche <me@carllerche.com>2010-10-14 21:27:40 -0700
commit69789c3b29b9ee0b89928f4211060f470d0e0c44 (patch)
tree00a9aeae23bdaeb9a27c89aa20be325bfb15a633 /activerecord/lib/active_record/transactions.rb
parent9ebe582830fd0386e09a917d81eb6cff494cd590 (diff)
downloadrails-69789c3b29b9ee0b89928f4211060f470d0e0c44.tar.gz
rails-69789c3b29b9ee0b89928f4211060f470d0e0c44.tar.bz2
rails-69789c3b29b9ee0b89928f4211060f470d0e0c44.zip
#transaction on the instance level should take options as well
Diffstat (limited to 'activerecord/lib/active_record/transactions.rb')
-rw-r--r--activerecord/lib/active_record/transactions.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index a7709b9489..ab737f0f88 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -224,8 +224,8 @@ module ActiveRecord
end
# See ActiveRecord::Transactions::ClassMethods for detailed documentation.
- def transaction(&block)
- self.class.transaction(&block)
+ def transaction(options = {}, &block)
+ self.class.transaction(options, &block)
end
def destroy #:nodoc: