aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Schneeman <richard.schneeman+no-recruiters@gmail.com>2017-03-15 08:44:31 -0500
committerGitHub <noreply@github.com>2017-03-15 08:44:31 -0500
commite79a991ccfdf3b7b56562be35b996e61d7395861 (patch)
tree71b336bd7c8e0c3fd4e51a0b6bc0fb48223d77be
parenta2c8639a5159abde00a05e43fae44aa9df895beb (diff)
parenta05845e0a699e169c11962212200dc8e72934dff (diff)
downloadrails-e79a991ccfdf3b7b56562be35b996e61d7395861.tar.gz
rails-e79a991ccfdf3b7b56562be35b996e61d7395861.tar.bz2
rails-e79a991ccfdf3b7b56562be35b996e61d7395861.zip
Merge pull request #28423 from eugeneius/rm_txn
Remove unused `@txn` variable
-rw-r--r--activerecord/lib/active_record/core.rb1
-rw-r--r--guides/source/debugging_rails_applications.md1
2 files changed, 0 insertions, 2 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
diff --git a/guides/source/debugging_rails_applications.md b/guides/source/debugging_rails_applications.md
index ba0cdbf3af..33dee6a868 100644
--- a/guides/source/debugging_rails_applications.md
+++ b/guides/source/debugging_rails_applications.md
@@ -606,7 +606,6 @@ You can also inspect for an object method this way:
@new_record = true
@readonly = false
@transaction_state = nil
-@txn = nil
```
You can also use `display` to start watching variables. This is a good way of