aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
Commit message (Collapse)AuthorAgeFilesLines
* Replace `#=>` with `# =>` [ci skip]claudiob2014-12-171-1/+1
| | | | | | | | @rafaelfranca suggested in f7c7bcd9 that code examples should display the result after `# =>` and not after `#=>`. This commit replaces *all* the occurrences of `#=>` in the code documentation (mostly added by me :sob:) with the suggested `# =>`.
* Merge pull request #12746 from coreyward/masterRafael Mendonça França2014-05-071-11/+22
|\ | | | | | | Fix Hash#deep_merge bug and improve documentation — resolves #12738
| * Fix Hash#deep_merge bug and improve documentation — resolves #12738Corey Ward2013-12-091-11/+21
|/ | | | | | | | | 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.
* Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-241-2/+2
|\ | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb
| * Change syntax format for example returned valuesPrem Sichanugrist2013-11-111-3/+3
| | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip]
* | 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
| | | | Added missing space in previous hash related commit
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-211-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes.
| * 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
|/ | | | | Hash#merge accepts block that you can use to customize how hash values are merged. This change makes merge and deep_merge compatible.
* 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
| | | | | | [#2732 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* ActiveSupport Hash optimizations [#2902 state:resolved]Lourens Naude2009-07-151-1/+1
| | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
* 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
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 01:58:50 +0000