aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
Commit message (Expand)AuthorAgeFilesLines
* faster implementation of Hash#deep_mergeM. Simon Borg2017-08-161-12/+6
* [Active Support] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-111-0/+1
* Use frozen-string-literal in ActiveSupportKir Shatrov2017-07-091-0/+1
* Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-021-1/+0
* Enforce frozen string in RubocopKir Shatrov2017-07-011-0/+1
* Replace `#=>` with `# =>` [ci skip]claudiob2014-12-171-1/+1
* Merge pull request #12746 from coreyward/masterRafael Mendonça França2014-05-071-11/+22
|\
| * Fix Hash#deep_merge bug and improve documentation — resolves #12738Corey Ward2013-12-091-11/+21
|/
* Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-241-2/+2
|\
| * Change syntax format for example returned valuesPrem Sichanugrist2013-11-111-3/+3
* | documentation updated for Hashes [ci skip]KD2013-11-111-5/+5
|/
* fix output messages - docs [ci skip]Francesco Rodriguez2012-10-221-1/+1
* More changes around 1.9 hash syntaxAvnerCohen2012-10-211-3/+3
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-211-2/+2
|\
| * update AS/core_ext docs [ci skip]Francesco Rodriguez2012-09-121-2/+2
* | Allow passing block to deep_merge and deep_merge!Pranas Kiziela2012-09-131-4/+10
|/
* missing dot [ci skip]Vijay Dev2012-05-151-1/+1
* adding examples to Hash#deep_merge methodFrancesco Rodriguez2012-05-131-2/+7
* Speed up some Hash core extensions.José Valim and Mikel Lindsaar2010-01-241-7/+6
* Support deep-merging HashWithIndifferentAccess.Andrew Moreland2009-08-091-4/+5
* ActiveSupport Hash optimizations [#2902 state:resolved]Lourens Naude2009-07-151-1/+1
* Convert hash extension modules to class reopensJeremy Kemper2009-03-211-20/+13
* Allow deep merging of hash values for nested with_options. [#490 state:resolved]Lawrence Pit2008-07-171-0/+23