aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* `fast_xs` support has been removed. Use 'String#encode(xml: :attr)`.Aaron Patterson2013-04-053-19/+2
* Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_...Rafael Mendonça França2013-04-043-33/+1
* Merge pull request #10034 from benofsky/fix_skipping_object_callback_filtersRafael Mendonça França2013-04-043-1/+33
|\
| * Fixes skipping object callback filtersBen McRedmond2013-04-043-1/+33
* | Further simplify enumerable group_by testCarlos Antonio da Silva2013-04-041-3/+1
* | Replaced inject with mapAnupam Choudhury2013-04-041-2/+2
* | Removed unused comma after loop variableAnupam Choudhury2013-04-041-1/+1
* | Merge pull request #10080 from vipulnsward/railties_warning_fix_v2Steve Klabnik2013-04-031-0/+1
|\ \
| * | add require to suppress warning; remove variableVipul A M2013-04-041-0/+1
* | | Fixed TypoPrathamesh Sonpatki2013-04-041-1/+1
* | | Fix some railties test warningsVipul A M2013-04-031-3/+2
|/ /
* | Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-021-1/+1
* | Merge pull request #10041 from vipulnsward/more_destructive_mergeSantiago Pastorino2013-04-022-2/+2
|\ \
| * | change merge to merge! in AS on new hashesVipul A M2013-04-022-2/+2
| |/
* / Added missing assertAnupam Choudhury2013-04-026-25/+37
|/
* Merge pull request #9997 from vipulnsward/hash_destructive_mergeCarlos Antonio da Silva2013-03-302-2/+2
|\
| * change merge to merge!Vipul A M2013-03-292-2/+2
* | Merge pull request #10007 from vipulnsward/fix_AS_typosCarlos Antonio da Silva2013-03-303-14/+14
|\ \
| * | fix some typos in ASVipul A M2013-03-303-14/+14
| |/
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-302-4/+4
|\ \ | |/ |/|
| * Fix some typosAkira Matsuda2013-03-251-1/+1
| * Using American English spellings over British style spellingsPrathamesh Sonpatki2013-03-211-3/+3
* | determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn]Xavier Noria2013-03-282-0/+12
* | Merge pull request #9523 from stopdropandrew/Instrumenter#instrument-yields-p...Rafael Mendonça França2013-03-274-2/+16
|\ \
| * | ActiveSupport::Notifications::Instrumenter#instrument should yieldstopdropandrew2013-03-024-3/+16
* | | Fixed timezone mapping of Ulaanbaatar.Zolzaya2013-03-271-1/+1
* | | Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data.kennyj2013-03-261-1/+1
* | | Updated docs due to removal of serializer accessorAlbert Lash2013-03-241-3/+3
* | | Merge pull request #8501 from charliesome/version-to-sRafael Mendonça França2013-03-231-6/+7
|\ \ \
| * | | Add version method to top level modulesCharlie Somerville2013-03-211-6/+7
* | | | Tidying up some require : removing useless sort and homogenizing with the res...Intrepidd2013-03-201-2/+2
|/ / /
* | | remove unused payloads in blocks in caching instrumentationVipul A M2013-03-191-3/+3
* | | Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def'kennyj2013-03-191-1/+1
* | | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"Xavier Noria2013-03-181-1/+1
* | | instruct RDoc to only parse Ruby files under lib [Fixes #9779]Xavier Noria2013-03-181-1/+1
* | | Merge branch 'master-sec'Aaron Patterson2013-03-185-2/+45
|\ \ \
| * | | JDOM XXE Protection [CVE-2013-1856]Ben Murphy2013-03-155-2/+45
* | | | Merge pull request #9774 from senny/9772_reraise_no_method_error_in_proper_co...Andrew White2013-03-183-0/+15
|\ \ \ \
| * | | | `TimeWithZone` raises `NoMethodError` in proper context.Yves Senn2013-03-183-0/+15
* | | | | fix repeat of test; remove unused variable by use of each_keyVipul A M2013-03-182-2/+2
|/ / / /
* | | | Merge pull request #9757 from vipulnsward/remove_message_paramCarlos Antonio da Silva2013-03-171-1/+1
|\ \ \ \
| * | | | remove unused parameter passed to assert_query_equal methodVipul A M2013-03-171-1/+1
* | | | | Merge pull request #9758 from vipulnsward/remove_from_rakefileCarlos Antonio da Silva2013-03-171-2/+0
|\ \ \ \ \
| * | | | | extra lines from Rakefile removed, which also threw warningVipul A M2013-03-171-2/+0
| |/ / / /
* / / / / refactor test to drop unnecessary hash creation, test directly insteadVipul A M2013-03-171-16/+10
|/ / / /
* | | | Revert "Merge pull request #8156 from fredwu/acronym_fix-master"Steve Klabnik2013-03-163-8/+1
* | | | revises the CHANGELOG entry from 26aa265 [ci skip]Xavier Noria2013-03-161-2/+3
* | | | Added Inflector#underscore fix to the changelogFred Wu2013-03-171-0/+4
* | | | Fixed a bug where the inflector would replace camelCase strings and disregard...Fred Wu2013-03-172-1/+3
* | | | Revert "make new rails apps log to STDOUT"Steve Klabnik2013-03-152-19/+0