diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-19 15:19:57 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-21 11:16:40 -0800 |
| commit | 7642b7531d222c9d7a94add50fffca69458e0eef (patch) | |
| tree | 9e22e5e921f344c888bad2217b4e25a2d4f91538 /activesupport/lib/active_support/core_ext/big_decimal | |
| parent | 2570c85cb7de03a2c9cc183c73707a267f2efb91 (diff) | |
| download | rails-7642b7531d222c9d7a94add50fffca69458e0eef.tar.gz rails-7642b7531d222c9d7a94add50fffca69458e0eef.tar.bz2 rails-7642b7531d222c9d7a94add50fffca69458e0eef.zip | |
prefering psych as the yaml parser if possible, fixing assertions for YAML 1.1 compatibility
Diffstat (limited to 'activesupport/lib/active_support/core_ext/big_decimal')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/big_decimal/conversions.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb index a279849829..11c318c244 100644 --- a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb +++ b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb @@ -1,4 +1,10 @@ require 'bigdecimal' + +begin + require 'psych' +rescue LoadError +end + require 'yaml' class BigDecimal |