diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-28 14:24:11 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-28 14:24:11 -0800 |
| commit | c29eef7da735bf19e7c9cd205c753e8de24516cd (patch) | |
| tree | 4ffec39b8941fc05985db302bd5137b2dfb3cac0 | |
| parent | e19a7729d1d7504ea7405c7836126d1bd7612630 (diff) | |
| download | rails-c29eef7da735bf19e7c9cd205c753e8de24516cd.tar.gz rails-c29eef7da735bf19e7c9cd205c753e8de24516cd.tar.bz2 rails-c29eef7da735bf19e7c9cd205c753e8de24516cd.zip | |
load psych by default if possible
| -rw-r--r-- | activesupport/lib/active_support/ordered_hash.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb index 5b8c342f4f..ac20988230 100644 --- a/activesupport/lib/active_support/ordered_hash.rb +++ b/activesupport/lib/active_support/ordered_hash.rb @@ -1,3 +1,8 @@ +begin + require 'psych' +rescue LoadError +end + require 'yaml' YAML.add_builtin_type("omap") do |type, val| |