diff options
| author | Corey Ward <corey.atx@gmail.com> | 2013-11-02 17:03:43 -0500 |
|---|---|---|
| committer | Corey Ward <corey.atx@gmail.com> | 2013-12-09 13:50:18 -0600 |
| commit | 0438134476b05d14dffbb28f84eac582bd3cfa8f (patch) | |
| tree | 97d3f91cff3fe7f3e351d3e1b2305f42f932f5bd /activesupport/lib/active_support/cache/file_store.rb | |
| parent | 4aae538d9ffff3a00a81f3da52fa70f7fd79ac74 (diff) | |
| download | rails-0438134476b05d14dffbb28f84eac582bd3cfa8f.tar.gz rails-0438134476b05d14dffbb28f84eac582bd3cfa8f.tar.bz2 rails-0438134476b05d14dffbb28f84eac582bd3cfa8f.zip | |
Fix Hash#deep_merge bug and improve documentation — resolves #12738
Previously merging into a hash with a falsy value would not result in
the merge-block being called. The fix is simply to check for presence
of the key in the hash.
The documentation example for `deep_merge` now appropriately
demonstrates what a deep merge does.
Diffstat (limited to 'activesupport/lib/active_support/cache/file_store.rb')
0 files changed, 0 insertions, 0 deletions