aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorEugene Kenny <elkenny@gmail.com>2017-03-15 12:14:46 +0000
committerEugene Kenny <elkenny@gmail.com>2017-03-15 12:14:46 +0000
commita05845e0a699e169c11962212200dc8e72934dff (patch)
tree8c48d03d9f7dd7482716057e8d9e3c9b017fd4c8 /activerecord
parentef28b68496c53f4b4aead732ac67803e8e096aa2 (diff)
downloadrails-a05845e0a699e169c11962212200dc8e72934dff.tar.gz
rails-a05845e0a699e169c11962212200dc8e72934dff.tar.bz2
rails-a05845e0a699e169c11962212200dc8e72934dff.zip
Remove unused `@txn` variable
This was added in c24c885209ac2334dc6f798c394a821ee270bec6, removed in b89ffe7f0047eb614e42232a21201b317b880755, and then (unintentionally?) reintroduced in 2d7ae1b08ee2a10b12cbfeef3a6cc6da55b57df6.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/core.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 0028dc0edb..8f78330d4a 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -559,7 +559,6 @@ module ActiveRecord
@marked_for_destruction = false
@destroyed_by_association = nil
@new_record = true
- @txn = nil
@_start_transaction_state = {}
@transaction_state = nil
end