aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-124-2/+11
|\
| * added docs for InheritedOptions class [ci skip]Anton Kalyaev2013-05-111-0/+8
| * changed rails -> Rails at two placesaditya-kapoor2013-05-092-2/+2
| * Changed spelling of Busines to Businessaditya-kapoor2013-05-081-1/+1
| * replace apostrophe with backquote for matching [ci skip]Anton Kalyaev2013-05-031-2/+2
| * document String#to_time exceptionVipul A M2013-05-021-0/+1
* | Replace multi_json with jsonErik Michaels-Ober2013-05-113-45/+18
* | Give credits to all the envolved people [ci skip]Rafael Mendonça França2013-05-101-1/+1
* | Merge pull request #10534 from cmaruz/masterRafael Mendonça França2013-05-103-3/+12
|\ \
| * | Added escaping of U+2028 and U+2029 inside the json encoder.Mario Caropreso2013-05-093-5/+14
* | | Fix syntax error on Ruby 2.0Rafael Mendonça França2013-05-101-2/+4
* | | Merge pull request #10057 from zackham/patch-1Rafael Mendonça França2013-05-101-2/+4
|\ \ \
| * | | Escape multibyte line terminators in JSON encodingzackham2013-04-021-2/+4
* | | | Merge pull request #10535 from vipulnsward/remove_varCarlos Antonio da Silva2013-05-091-1/+0
|\ \ \ \
| * | | | remove redundant varVipul A M2013-05-091-1/+0
* | | | | Merge pull request #10531 from waseem/refactor_requireCarlos Antonio da Silva2013-05-091-4/+4
|\ \ \ \ \
| * | | | | Require different core extensions correctly.Waseem Ahmad2013-05-091-4/+4
| |/ / / /
* / / / / rails -> Rails [ci skip]Prathamesh Sonpatki2013-05-092-2/+2
|/ / / /
* | | | use public send on the scope parametersAaron Patterson2013-05-081-1/+1
* | | | add test for object conditional with scopeAaron Patterson2013-05-081-0/+19
* | | | using strings as scopes is not used anywhere, so remove itAaron Patterson2013-05-081-1/+1
* | | | adding a class conditional testAaron Patterson2013-05-081-0/+12
* | | | adding tests for lambdas as conditionsAaron Patterson2013-05-082-1/+41
| |/ / |/| |
* | | separate identification computationAaron Patterson2013-05-081-24/+18
* | | separate filters from source codeAaron Patterson2013-05-081-20/+31
* | | if the callbacks are not the same class, they cannot be duplicatesAaron Patterson2013-05-081-2/+6
* | | fix object comparison caseAaron Patterson2013-05-081-1/+5
* | | polymorphic comparison operatorAaron Patterson2013-05-081-11/+24
* | | we need to indicate the type of callbackAaron Patterson2013-05-081-2/+2
* | | Merge pull request #10355 from burke/masterJeremy Kemper2013-05-081-39/+19
|\ \ \
| * | | Use ruby's Encoding support for tidy_bytesBurke Libbey2013-05-081-39/+19
* | | | adding more tests around callback inconsistenciesAaron Patterson2013-05-081-5/+47
* | | | refactor tests for more pointsAaron Patterson2013-05-081-4/+5
* | | | adding test to demonstrate inconsistencies in the AS::Callbacks apiAaron Patterson2013-05-081-0/+41
|/ / /
* | | dependency ActiveSupport::DeprecationTomohiko Himura2013-05-091-0/+2
* | | Fix Typo existant -> existent [ci skip]Prathamesh Sonpatki2013-05-081-1/+1
* | | add changelog entry for fix-10502-skip-object-filterSean Walbran2013-05-071-0/+5
* | | fix issue #10502, do not recompute method name for already-stringified object...Sean Walbran2013-05-072-1/+23
* | | Merge pull request #10234 from dasch/dasch/fetch-multiRafael Mendonça França2013-05-063-1/+61
|\ \ \
| * | | Allow fetching multiple values from the cache at onceDaniel Schierbeck2013-05-063-1/+61
* | | | Merge pull request #10453 from vipulnsward/destructive_sortJeremy Kemper2013-05-051-1/+1
|\ \ \ \
| * | | | use destructive sort on array in Hash#to_param for performance gains.Vipul A M2013-05-051-1/+1
| |/ / /
* | | | use nokogirisax as a backendAnton Kalyaev2013-05-051-3/+3
* | | | Fixed bad tests to clean up after themselves.Ryan Davis2013-05-034-6/+27
* | | | Squashed commit of the following:Aaron Patterson2013-05-0316-172/+7
|/ / /
* | | Merge pull request #10413 from vipulnsward/change_groupingCarlos Antonio da Silva2013-05-031-1/+1
|\ \ \
| * | | Use faster Array.new instead of []*paddingVipul A M2013-05-021-1/+1
| | |/ | |/|
* | | Revert "Merge pull request #10433 from wangjohn/making_callbacks_more_perform...Jon Leighton2013-05-031-33/+11
* | | Work around change in how MiniTest detects SIGINFOJon Leighton2013-05-031-0/+4
* | | Improving the performance of callbacks by keeping a hash of thewangjohn2013-05-021-11/+33