Permalink
Browse files

Merge pull request #12791 from jasonayre/ja/fix_autoload_error

add autoload :TransactionState to fix Marshal.load issues
  • Loading branch information...
rafaelfranca committed Nov 7, 2013
2 parents b683ec6 + 746d286 commit 587f15d19137416a78114ba77b27aac9ce501e5f
@@ -1,3 +1,8 @@
+* Fix uninitialized constant TransactionState error when Marshall.load is used on an Active Record result.
+ Fixes #12790
+
+ *Jason Ayre*
+
* `.unscope` now removes conditions specified in `default_scope`.
*Jon Leighton*
@@ -40,6 +40,7 @@ module ConnectionAdapters # :nodoc:
autoload :ClosedTransaction
autoload :RealTransaction
autoload :SavepointTransaction
+ autoload :TransactionState
end
# Active Record supports multiple database systems. AbstractAdapter and

0 comments on commit 587f15d

Please sign in to comment.