aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-11-12 23:59:25 +0900
committerGitHub <noreply@github.com>2018-11-12 23:59:25 +0900
commit1cbc6555f5eeaae32abaf7f35db807cbb3a3a9c9 (patch)
tree627a407320d18ddc8ea4bd8d4cb5b91154061950
parent1cc46865ecfeed614f36505ac213f364a0231dca (diff)
parentd8a9bc02f34bcbc18028db4df87b7fcf8a82b738 (diff)
downloadrails-1cbc6555f5eeaae32abaf7f35db807cbb3a3a9c9.tar.gz
rails-1cbc6555f5eeaae32abaf7f35db807cbb3a3a9c9.tar.bz2
rails-1cbc6555f5eeaae32abaf7f35db807cbb3a3a9c9.zip
Merge pull request #34425 from eugeneius/rm_ensure_from_with_transaction_returning_status
Remove ensure from with_transaction_returning_status
-rw-r--r--activerecord/lib/active_record/transactions.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index c5d5fca672..fe3842b905 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -375,10 +375,6 @@ module ActiveRecord
raise ActiveRecord::Rollback unless status
end
status
- ensure
- if @transaction_state && @transaction_state.committed?
- clear_transaction_record_state
- end
end
private