aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10179 from vipulnsward/refactor_order_hash_testSantiago Pastorino2013-04-111-5/+1
|\
| * refactor order hash testVipul A M2013-04-111-5/+1
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-114-8/+17
|\ \ | |/ |/|
| * fix Array#uniq_by! docs [ci skip]Francesco Rodriguez2013-04-041-2/+2
| * add documentation to Benchmark#ms [ci skip]Francesco Rodriguez2013-04-041-0/+7
| * fix broken format in Array#to_sentence [ci skip]Francesco Rodriguez2013-04-041-3/+5
| * Merge branch 'master' of github.com:rails/railsVijay Dev2013-03-3031-84/+178
| |\
| * | Revert "Using American English spellings over British style spellings"Vijay Dev2013-03-301-3/+3
* | | Revert "Merge pull request #10158 from steveklabnik/issue_10125"Rafael Mendonça França2013-04-102-19/+2
* | | Using public send instead of send for the PerThreadRegistry module.wangjohn2013-04-101-1/+1
* | | Removed unused setupAnupam Choudhury2013-04-101-2/+0
* | | Fixed typoAnupam Choudhury2013-04-101-1/+1
* | | Merge pull request #10158 from steveklabnik/issue_10125Steve Klabnik2013-04-092-2/+19
|\ \ \
| * | | Fix inflector to respect default locale.Nick Cox2013-04-102-2/+19
* | | | Changed the ScopeRegistry and the InstrumentationRegistry to use thewangjohn2013-04-091-5/+4
* | | | Creating a module so that per thread registries can be easily created aswangjohn2013-04-091-0/+41
|/ / /
* | | Creating an object to consolidate thread locals which hold thewangjohn2013-04-081-1/+27
* | | Fix markdown formattingAgis Anastasopoulos2013-04-061-1/+1
* | | Add option to Class#class_attribute for skipping the query methodAgis-2013-04-063-5/+18
* | | `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
|/ / /