Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. | Jeremy Kemper | 2013-01-08 | 1 | -4/+23 |
| | |||||
* | Revert "Merge branch 'master-sec'" | Jeremy Kemper | 2013-01-08 | 1 | -23/+4 |
| | | | | | This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing changes made to f049016cd348627bf8db0d72382d7580bf802a79. | ||||
* | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. | Jeremy Kemper | 2013-01-08 | 1 | -4/+23 |
| | |||||
* | Change docs to use update instead of update_attributes | Amparo Luna + Guillermo Iguaran | 2013-01-03 | 1 | -1/+1 |
| | |||||
* | Refactor Hash.from_xml. | Steve Klabnik + Katrina Owen | 2012-12-21 | 1 | -50/+100 |
| | | | | | | | | | | | | Three basic refactors in this PR: * We extracted the logic into a method object. We now don't define a tone of extraneous methods on Hash, even if they were private. * Extracted blocks of the case statement into methods that do the work. This makes the logic more clear. * Extracted complicated if clauses into their own query methods. They often have two or three terms, this makes it much easier to see what they _do_. We took care not to refactor too much as to not break anything, and put comments where we suspect tests are missing. We think ActiveSupport::XMLMini might be a good candidate to move to a plugin in the future. | ||||
* | Replace comments' non-breaking spaces with spaces | claudiob | 2012-12-04 | 2 | -6/+6 |
| | | | | | | | | | | Sometimes, on Mac OS X, programmers accidentally press Option+Space rather than just Space and don’t see the difference. The problem is that Option+Space writes a non-breaking space (0XA0) rather than a normal space (0x20). This commit removes all the non-breaking spaces inadvertently introduced in the comments of the code. | ||||
* | Add documentation for Hash.from_xml [ci skip] | HPNeo | 2012-12-01 | 1 | -0/+13 |
| | |||||
* | Please use assert_equal instead of diff directly | Ryan Davis | 2012-11-17 | 1 | -1/+1 |
| | |||||
* | Match classes without to_s conversions. | Nikita Afanasenko | 2012-11-11 | 1 | -10/+10 |
| | | | | There is no need in `value_under_case.class.to_s` conversion since case already matches classes with `Class === value_under_case`. | ||||
* | Deprecate Hash#diff. | Steve Klabnik | 2012-11-09 | 1 | -0/+1 |
| | | | | | | It's no longer used in Rails any more. See https://github.com/rails/rails/pull/8142\#issuecomment-10227297 for more | ||||
* | Use `tag!` instead of `method_missing` in `to_xml` conversions. | Nikita Afanasenko | 2012-11-04 | 1 | -2/+2 |
| | | | | Since version `3.0.x` `Builder` caches method passed to `method_missing` each time. This commit replaces `method_missing` call with `tag!` call to prevent method redefinition on each `to_xml` call with the same builder. | ||||
* | fix output messages - docs [ci skip] | Francesco Rodriguez | 2012-10-22 | 2 | -4/+4 |
| | |||||
* | More changes around 1.9 hash syntax | AvnerCohen | 2012-10-21 | 1 | -3/+3 |
| | | | | Added missing space in previous hash related commit | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-21 | 2 | -2/+2 |
|\ | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md | ||||
| * | Hash Syntax changes to 1.9 format | AvnerCohen | 2012-10-20 | 2 | -3/+3 |
| | | |||||
* | | Merge pull request #7007 from Mik-die/hash_extract | Rafael Mendonça França | 2012-10-12 | 1 | -3/+3 |
|\ \ | |/ |/| | make Hash#extract! more symmetric with Hash#slice | ||||
| * | make Hash#extract! more symmetric with Hash#slice | Mikhail Dieterle | 2012-10-08 | 1 | -3/+3 |
| | | |||||
* | | let (array|hash)/conversions.rb load the extensions in ↵ | Xavier Noria | 2012-10-09 | 1 | -1/+3 |
|/ | | | | object/to_(param|query).rb | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-21 | 7 | -21/+22 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | fix Hash#slice code example [ci skip] | Francesco Rodriguez | 2012-09-18 | 1 | -1/+1 |
| | | |||||
| * | fix AS/core_ext examples [ci skip] | Francesco Rodriguez | 2012-09-12 | 3 | -3/+3 |
| | | |||||
| * | update AS/core_ext docs [ci skip] | Francesco Rodriguez | 2012-09-12 | 7 | -20/+21 |
| | | |||||
* | | Allow passing block to deep_merge and deep_merge! | Pranas Kiziela | 2012-09-13 | 1 | -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. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-06-30 | 1 | -7/+0 |
|\ | | | | | | | | | Conflicts: activemodel/lib/active_model/errors.rb | ||||
| * | Remove mention of `convert_key` now that it's been taken out in ↵ | Alex Nisnevich | 2012-06-28 | 1 | -7/+0 |
| | | | | | | | | 1eecd9483b0439ab4913beea36f0d0e2aa0518c7 | ||||
* | | Speed up Hash#transform_keys using Hash#each_key | Grant Hutchins | 2012-06-27 | 1 | -1/+1 |
|/ | | | See https://gist.github.com/3007749 for justification | ||||
* | update Hash documentation with 1.9 syntax [ci skip] | Francesco Rodriguez | 2012-05-26 | 1 | -8/+16 |
| | |||||
* | add examples to Hash#deep_stringify_keys and Hash#deep_symbolize_keys [ci skip] | Francesco Rodriguez | 2012-05-26 | 1 | -0/+10 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-26 | 1 | -1/+1 |
|\ | |||||
| * | Fix unbalanced braces in Hash#typecast_xml_value internal comment | Alexey Vakhov | 2012-05-25 | 1 | -1/+1 |
| | | |||||
* | | Reorder deep_symbolize_keys methods | Mark McSpadden | 2012-05-25 | 1 | -7/+7 |
| | | |||||
* | | Add Hash#deep_transform_keys and Hash#deep_transform_keys! Also convert ↵ | Mark McSpadden | 2012-05-23 | 1 | -17/+26 |
|/ | | | | deep_*_keys to use deep_transform_keys. | ||||
* | Adding deep versions of stringify_keys and symbolize_keys (plain and bang) ↵ | Lucas Húngaro | 2012-05-23 | 1 | -0/+44 |
| | | | | for nested hashes | ||||
* | Add Hash#transform_keys and Hash#transform_keys! and refactor *_keys methods ↵ | Mark McSpadden | 2012-05-23 | 1 | -18/+25 |
| | | | | to use them. | ||||
* | changed xml type datetime to dateTime, fixes #6328 | Angelo capilleri | 2012-05-23 | 1 | -2/+2 |
| | | | | | | | | | XmlMini define the xml 'datatime', but according to http://www.w3.org/TR/xmlschema-2/#dateTime could be better change this to 'dateTime' with upper case letter 'T. So 'DateTime' and 'Time' are redefined from 'datetime' to 'dateTime' add the changing to the changelog | ||||
* | missing dot [ci skip] | Vijay Dev | 2012-05-15 | 1 | -1/+1 |
| | |||||
* | removing unnecessary 'examples' noise from activesupport | Francesco Rodriguez | 2012-05-13 | 1 | -2/+0 |
| | |||||
* | Fixing Hash#stringify_keys docs | Francesco Rodriguez | 2012-05-13 | 1 | -1/+1 |
| | |||||
* | marking self in Hash#symbolize_keys! | Francesco Rodriguez | 2012-05-13 | 1 | -1/+1 |
| | |||||
* | added example to Hash#symbolize_keys | Francesco Rodriguez | 2012-05-13 | 1 | -2/+5 |
| | |||||
* | unnecessary 'examples' noise in Hash#assert_valid_keys docs | Francesco Rodriguez | 2012-05-13 | 1 | -1/+0 |
| | |||||
* | added example to Hash#stringify_keys | Francesco Rodriguez | 2012-05-13 | 1 | -1/+5 |
| | |||||
* | adding examples to Hash#deep_merge method | Francesco Rodriguez | 2012-05-13 | 1 | -2/+7 |
| | |||||
* | Keep all methods in object/deep_dup | Piotr Sarnacki | 2012-05-06 | 1 | -8/+0 |
| | |||||
* | Nice logic for deep_dup in rails | Alexey Gaziev | 2012-05-06 | 1 | -4/+2 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-01 | 1 | -1/+1 |
|\ | |||||
| * | Minor English fix. | Erich Menge | 2012-04-30 | 1 | -1/+1 |
| | | |||||
* | | String quotes and trailing spaces | Alexey Gaziev | 2012-04-29 | 3 | -22/+22 |
| | | |||||
* | | AS core_ext refactoring pt.2 | Alexey Gaziev | 2012-04-29 | 4 | -7/+7 |
|/ | |||||
* | Inline the symbolize_keys/stringify_keys methods | Santiago Pastorino | 2012-04-08 | 1 | -2/+10 |
| | | | | | | user system total real symbolize_keys 5.980000 0.070000 6.050000 ( 6.048187) new_symbolize_keys 4.310000 0.050000 4.360000 ( 4.364745) |