aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* Adding a missing parenthesis in the doc of String#parameterize.Geoffrey Roguelon2012-10-241-2/+2
* fix output messages - docs [ci skip]Francesco Rodriguez2012-10-224-6/+6
* More changes around 1.9 hash syntaxAvnerCohen2012-10-212-4/+4
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-215-8/+8
|\
| * Hash Syntax changes to 1.9 formatAvnerCohen2012-10-205-9/+9
* | fix assertionsAaron Patterson2012-10-181-2/+2
* | Make DescendantsTracker thread safe and optimize the #descendants method.thedarkone2012-10-183-30/+51
* | some ruby interpreters don't have ruby-prof so just skip the testsAaron Patterson2012-10-182-4/+13
* | Revert "remove unnecessary object/conversions file"Xavier Noria2012-10-164-2/+11
* | Backpedal from class-oriented config.queue. Set an actual queue instance.Jeremy Kemper2012-10-121-4/+0
* | Remove the queue container. Premature consolidation. Set up and maintain queu...Jeremy Kemper2012-10-122-54/+0
* | Merge pull request #7007 from Mik-die/hash_extractRafael Mendonça França2012-10-123-4/+39
|\ \
| * | add more testcases and doc about Hash#extract!Mikhail Dieterle2012-10-082-4/+11
| * | make Hash#extract! more symmetric with Hash#sliceMikhail Dieterle2012-10-083-3/+31
* | | Move the TestQueue tests to the proper fileRafael Mendonça França2012-10-121-0/+44
* | | Merge pull request #7913 from mje113/masterXavier Noria2012-10-121-0/+4
|\ \ \
| * | | Padding expires_in by 5 minutes on dalli key write to facilitate :race_condit...Mike Evans2012-10-111-0/+4
| | |/ | |/|
* | | Cleanup trailing whitespacesdfens2012-10-121-1/+1
* | | adding a test for b21f24d9807bd161af947cf0f0cc440c9adffb73Aaron Patterson2012-10-111-0/+14
|/ /
* | Ensure expires_in and created_at timestamps aren't nil when attempting to upg...Joshua Peek2012-10-101-1/+1
* | let (array|hash)/conversions.rb load the extensions in object/to_(param|query...Xavier Noria2012-10-093-3/+5
* | adds a missing requireXavier Noria2012-10-091-0/+1
* | adds missing requireXavier Noria2012-10-091-0/+1
* | keys.include? -> key?Xavier Noria2012-10-091-1/+1
* | Merge pull request #7817 from NARKOZ/object-conversionsXavier Noria2012-10-094-11/+2
|\ \ | |/ |/|
| * remove unnecessary object/conversions fileNihad Abbasov2012-10-024-11/+2
* | explains why these requires are in an unusual placeXavier Noria2012-10-071-0/+8
* | Merge pull request #7650 from kennyj/fix_warning_20120915Xavier Noria2012-10-071-6/+7
|\ \
| * | Fix warning: circular require considered harmful.kennyj2012-10-031-6/+7
| |/
* | Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring them. N...Jeremy Kemper2012-10-061-1/+0
* | rename private method to avoid overridingFrancesco Rodriguez2012-10-061-2/+2
* | use Rails backtrace in testsFrancesco Rodriguez2012-10-051-0/+1
* | bump minitest version ~> 4.1.0Francesco Rodriguez2012-10-051-1/+1
* | Revert "Use flat_map { } instead of map {}.flatten"Santiago Pastorino2012-10-051-2/+2
* | Use flat_map { } instead of map {}.flattenSantiago Pastorino2012-10-051-2/+2
* | Merge pull request #6952 from NZKoz/key_generatorMichael Koziarski2012-10-023-0/+56
|\ \ | |/ |/|
| * Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2Michael Koziarski2012-10-013-0/+56
* | Merge pull request #7708 from bdurand/optimize_log_subscribersRafael Mendonça França2012-10-011-0/+2
|\ \
| * | Optimize log subscribers to check if the log level is sufficient before perfo...Brian Durand2012-09-301-0/+2
* | | New CHANGELOG entries always in the topRafael Mendonça França2012-10-011-2/+2
* | | warning fixed: (...) interpreted as grouped expressionArun Agrawal2012-10-011-1/+1
* | | fix broken cache testsBrian Durand2012-09-302-3/+3
| |/ |/|
* | Fix other assertions that were backwards.Steve Klabnik2012-09-301-5/+5
* | fix order of assertions.Steve Klabnik2012-09-301-2/+2
* | Optimize ActiveSupport::Cache::Entry to reduce memory and processing overhead.Brian Durand2012-09-304-101/+141
* | Merge pull request #7784 from morgoth/proper_test_names_for_assertionsRafael Mendonça França2012-09-281-2/+2
|\ \
| * | Changed test names to match proper contextWojciech Wnętrzak2012-09-281-2/+2
* | | Update minitest dependency to ~> 4.0Erik Michaels-Ober2012-09-281-1/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-282-2/+22
|\ \
| * | Improve documentation for subscribe blockGrant Hutchins & Sabrina Staedt2012-09-271-1/+11