aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* Tidy up previous commit, fix message assertion and improve testsCarlos Antonio da Silva2013-12-032-2/+9
* Modify the Hash#assert_valid_keys error message so that it shows the valid ke...Nerian2013-12-033-4/+9
* Merge pull request #13060 from chancancode/change_log_for_json_refactorCarlos Antonio da Silva2013-12-023-0/+59
|\
| * Added back the `encode_big_decimal_as_string` option with warningGodfrey Chan2013-12-023-0/+59
* | Avoid generating more strings while iterating to create methodsCarlos Antonio da Silva2013-12-021-1/+1
* | Merge remote-tracking branch 'origin/master'Rafael Mendonça França2013-12-022-2/+2
|\ \
| * | Remove deprecated cattr_* requiresGenadi Samokovarov2013-12-032-2/+2
* | | :sicssors:Rafael Mendonça França2013-12-028-15/+2
* | | Options are not optionalRafael Mendonça França2013-12-021-2/+2
* | | Make execute priave APIRafael Mendonça França2013-12-027-12/+16
* | | Make load of NumberHelper thread safeRafael Mendonça França2013-12-029-26/+18
* | | Merge pull request #10996 from mattdbridges/number-helper-refactorRafael Mendonça França2013-12-0210-312/+533
|\ \ \ | |/ / |/| |
| * | Extract ActiveSupport::NumberHelper methods to classesMatt Bridges2013-07-0110-314/+533
* | | Merge pull request #11197 from gsamokovarov/unify-mattr-cattrGuillermo Iguaran2013-12-026-269/+194
|\ \ \
| * | | Unify cattr and mattr accessors declarationsGenadi Samokovarov2013-12-026-269/+194
* | | | :scissors:Rafael Mendonça França2013-12-021-4/+4
|/ / /
* | / added missing requireDaniel Harrington2013-12-021-0/+1
| |/ |/|
* | EscapedString is also private API [ci skip]Godfrey Chan2013-12-011-1/+1
* | Merge pull request #11796 from thedarkone/time-zone-thread-safetyGuillermo Iguaran2013-11-301-13/+7
|\ \
| * | Remove AS::TZ.lookup(name).thedarkone2013-08-071-5/+1
| * | Unify AS::TZ's lazy init maps.thedarkone2013-08-071-9/+5
| * | Use TS::Cache instead plain Hash in TimeZone.thedarkone2013-08-071-5/+7
* | | Merge pull request #13055 from dmitriy-kiriyenko/fix-segmentation-fault-it-ru...Rafael Mendonça França2013-11-302-0/+13
|\ \ \
| * | | Fix segmentation fault in Ruby 2.0.0-p353.Dmitriy Kiriyenko2013-11-302-0/+13
* | | | Merge pull request #13111 from akshay-vishnoi/typoCarlos Antonio da Silva2013-11-301-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Typo fixes [ci skip]Akshay Vishnoi2013-11-301-2/+2
* | | | Merge pull request #13092 from laurocaetano/improve_documentation_for_delegateRafael Mendonça França2013-11-291-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Improve Module#delegate documentation to tell that delegate don't work with p...Lauro Caetano2013-11-291-0/+2
* | | | Typo fixAkshay Vishnoi2013-11-291-1/+1
|/ / /
* | | Merge pull request #13084 from lihanli/series-singularize-fixYves Senn2013-11-282-4/+6
|\ \ \
| * | | wrap test that changes inflections in with_dupLihan Li2013-11-282-4/+6
* | | | first pass through CHANGELOGS to extract 4_1_release_notes. [ci skip]Yves Senn2013-11-281-9/+11
* | | | remove duplicate sentence from AS changelog. [ci skip].Yves Senn2013-11-281-2/+1
|/ / /
* | | Deprecate ActiveSupport::TestCase.describeMike Moore2013-11-271-5/+12
* | | [ci skip] removed singulars section from classify docGreg Molnar2013-11-271-4/+0
* | | Merge branch 'deprecate_numeric_since_ago' of https://github.com/chancancode/...Jeremy Kemper2013-11-274-31/+58
|\ \ \
| * | | Deprecated Numeric#{ago,until,since,from_now}Godfrey Chan2013-11-264-31/+58
* | | | Requires JSON gem version 1.7.7 or above as it contains an importantGodfrey Chan2013-11-262-2/+6
|/ / /
* | | Be explicit and use the actual unicode sequenceGodfrey Chan2013-11-261-1/+1
* | | Process::Status should get a :nodoc: [ci skip]Godfrey Chan2013-11-261-1/+1
* | | Make the JSON encoder pluggableGodfrey Chan2013-11-261-2/+8
* | | Removed the Ruby encoder and switched to using the JSON gemGodfrey Chan2013-11-263-82/+74
* | | Removed support for encoding BigDecimal as a JSON numberGodfrey Chan2013-11-263-25/+1
* | | Expanded coverage on JSON encodingGodfrey Chan2013-11-261-2/+12
* | | Added some failing tests where the JSON encoder is not resolving as_json corr...Godfrey Chan2013-11-261-2/+12
* | | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-2412-76/+76
|\ \ \
| * | | The option is called encode_big_decimal_as_string [ci-skip]Godfrey Chan2013-11-151-1/+1
| * | | Change syntax format for example returned valuesPrem Sichanugrist2013-11-1112-79/+79
* | | | When Array#as_json and Hash#as_json are called without options, theyGodfrey Chan2013-11-222-2/+18
* | | | doc `travel` and `travel_to` stubs are removed in teardown. [ci skip]Yves Senn2013-11-211-4/+4