diff options
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/big_decimal/conversions.rb | 7 | ||||
| -rw-r--r-- | activesupport/lib/active_support/ordered_hash.rb | 6 |
2 files changed, 2 insertions, 11 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 403e8beac5..c2faa1ebe0 100644 --- a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb +++ b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb @@ -1,10 +1,5 @@ require 'bigdecimal' - -begin - require 'psych' -rescue LoadError -end - +require 'psych' require 'yaml' class BigDecimal diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb index fdf4a2bda3..7fd4168363 100644 --- a/activesupport/lib/active_support/ordered_hash.rb +++ b/activesupport/lib/active_support/ordered_hash.rb @@ -1,8 +1,4 @@ -begin - require 'psych' -rescue LoadError -end - +require 'psych' require 'yaml' YAML.add_builtin_type("omap") do |type, val| |