Merge pull request #28360 from kbrock/transaction_fix

Handle Timeout.timeout in rails queries

activerecord/lib/active_record/connection_adapters/abstract/transaction.rb

@@ -240,7 +240,7 @@ def within_new_transaction(options = {})
                 rollback_transaction if transaction
               else
                 begin
-                  commit_transaction
+                  commit_transaction if transaction
                 rescue Exception
                   rollback_transaction(transaction) unless transaction.state.completed?
                   raise