aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | String.to_time documentation along examples.Adam Stankiewicz2012-09-241-1/+11
* | | ConstantLookup is not needed in every TestCase decendantAndy Lindeman2012-09-262-1/+1
* | | Tests tag the Rails log with the current test class and test caseJeremy Kemper2012-09-264-0/+54
* | | Allow wrapping a logger that hasn't set a formatter. Default to our SimpleFor...Jeremy Kemper2012-09-262-2/+12
* | | Add logger.push_tags and .pop_tags to complement logger.taggedJeremy Kemper2012-09-263-14/+59
* | | Add missing inflector dependencyMike Moore2012-09-252-4/+3
* | | Add register_spec_type test coverageMike Moore2012-09-241-0/+23
* | | Create ActiveSupport::Testing::ConstantLookupMike Moore2012-09-243-0/+113
* | | Merge pull request #7726 from jcorcuera/masterSantiago Pastorino2012-09-211-1/+1
|\ \ \
| * | | Remove .rb from require sentencesJosé Corcuera Z2012-09-211-1/+1
| |/ /
* / / Raise the same exception the code is handlingSantiago Pastorino2012-09-211-1/+1
|/ /
* | Update examples in AS::Concern to use correct scope syntax. [ci skip]José Corcuera2012-09-211-2/+2
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-2179-873/+984
|\ \
| * | Fix indentation and update documentation for Array#wrap for Ruby 1.9Jo Liss2012-09-201-9/+10
| * | fix Hash#slice code example [ci skip]Francesco Rodriguez2012-09-181-1/+1
| * | update AS docs [ci skip]Francesco Rodriguez2012-09-1723-329/+378
| * | fix AS::OrderedOptions documentation [ci skip]Francesco Rodriguez2012-09-171-16/+15
| * | update AS/values and AS/xml_mini docs [ci skip]Francesco Rodriguez2012-09-144-39/+54
| * | update AS/notifications and AS/testing docs [ci skip]Francesco Rodriguez2012-09-143-8/+10