aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updated ARel version.Emilio Tagua2009-09-141-5/+5
* Merge commit 'rails/master'Emilio Tagua2009-09-14250-673/+1223
|\
| * Lookup ruby bin name tooJoshua Peek2009-09-141-1/+1
| * Use rbconfig instead of rubygem detectionJoshua Peek2009-09-141-1/+2
| * For testing, only load rubygems if mocha is missingJoshua Peek2009-09-141-1/+8
| * Forgot to update load path dir for vendored memcacheJoshua Peek2009-09-142-2/+1
| * Use abortJeremy Kemper2009-09-131-2/+1
| * Skip parent isolation tests tooJeremy Kemper2009-09-131-121/+123
| * Don't run `gem bundle` by defaultJoshua Peek2009-09-131-22/+3
| * Bump vendored memcache to 1.7.5Joshua Peek2009-09-131-93/+292
| * Rollback AS bundler work and improve activation of vendored dependenciesJoshua Peek2009-09-1318-96/+54
| * Callbacks need to require reportingJoshua Peek2009-09-131-0/+1
| * Restore AS vendor file until we get things sorted out in railtiesJoshua Peek2009-09-132-0/+28
| * Rewrite resource routing tests that are coupled to the router implementationJoshua Peek2009-09-131-2/+3
| * Need to reset session for AP rescue tests after altering the route setJoshua Peek2009-09-131-0/+1
| * Define weblog controller for url helper testJoshua Peek2009-09-132-0/+2
| * AV::UrlHelper depends on Array#secondJoshua Peek2009-09-131-0/+1
| * Omit PATH_INFO in integration test so rack mock will properly override itJoshua Peek2009-09-131-1/+0
| * AP tests: detect missing dependencies and automatically run bundlerJoshua Peek2009-09-133-4/+34
| * Merge abstract_controller/test_helper and new_base/test_helper since they are...Joshua Peek2009-09-1326-100/+49
| * Don't eager require mocha, AS unit needs to set stuff up firstJoshua Peek2009-09-131-1/+1
| * Remove dead old base abstract unitJoshua Peek2009-09-131-46/+0
| * Lazy require memcache for session middlewareJoshua Peek2009-09-131-40/+35
| * Detect missing dependencies and automatically run bundlerJoshua Peek2009-09-134-13/+32
| * Ignore bundled gemsJoshua Peek2009-09-137-4/+1
| * Shush interpolation warningsJoshua Peek2009-09-131-2/+6
| * Forget about old memoize immutable behaviorJoshua Peek2009-09-131-10/+0
| * Need to declare optional dependencies from ASJoshua Peek2009-09-132-1/+10
| * Load vendored i18n if its not found since its a real requirementJoshua Peek2009-09-131-1/+7
| * Avoid referencing rubygemsJoshua Peek2009-09-131-1/+1
| * Don't force test suite to use bundlerJoshua Peek2009-09-134-3/+10
| * Move AS vendor support into bundler.Joshua Peek2009-09-13155-36/+35
| * require reporting before attempting to "shush"Joshua Peek2009-09-132-0/+3
| * Shush, new_callbacksJeremy Kemper2009-09-131-2/+4
| * Shush, rexmlJeremy Kemper2009-09-132-3/+3
| * Prefer not to shadow a localJeremy Kemper2009-09-131-1/+1
| * Ignore isolation test tests for test-unit 2 alsoJeremy Kemper2009-09-131-2/+3
| * Clean up spurious JSON decoding test failureJeremy Kemper2009-09-134-16/+7
| * Ruby 1.9 compat: fix regexp slice testJeremy Kemper2009-09-131-1/+1
| * Silence warning for Encoding.default_external=Jeremy Kemper2009-09-131-9/+5
| * Use Encoding.default_external, not _internalJeremy Kemper2009-09-132-10/+10
| * Ruby 1.9 compat: corrected instance_methods checksdsykes2009-09-131-1/+2
| * activesupport -> active_supportJeremy Kemper2009-09-131-3/+2
| * making secure_compare fasterAaron Patterson2009-09-131-28/+8
| * Dup the arguments to string compare so we can use force_encoding.Michael Koziarski2009-09-131-2/+2
| * Merge commit 'alloy/master-nested_attributes_and_autosave'Michael Koziarski2009-09-1315-94/+424
| |\
| | * Removed the version of ActiveRecord::Base#destroyed? that was added in a44a12...Eloy Duran2009-09-122-7/+0
| | * Removed some superfluous conditionals from the autosave association validatio...Eloy Duran2009-09-121-5/+3
| | * Define autosave association validation methods only when needed. [#3161 state...Alexey Kovyrin2009-09-124-7/+132
| | * Added some documentation about setting :autosave => false on an association.Eloy Duran2009-09-121-3/+4