aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'master' of git@github.com:rails/railsgbuesing2008-11-135-61/+92
| |\
| | * Instead of overriding html_types, base the verification on browser_generated_...Michael Koziarski2008-11-132-7/+20
| | * fix two MimeType failing test casesrick2008-11-132-7/+10
| | * Changed request forgery protection to only worry about HTML-formatted content...Jeff Cohen2008-11-134-55/+70
| * | TimeZone: fix base offset for Sri Jayawardenepura. Anchor tests for zone offs...gbuesing2008-11-133-3/+5
| |/
| * TimeZone: Caracas GMT offset changed to -4:30 [#1361 state:resolved]Phil Ross2008-11-122-1/+4
| * Add :only/:except options to map.resourcesTom Stuart2008-11-122-37/+247
| * Fixed method_missing for ActionMailer so it no longer matches methods where d...Joel Chippindale2008-11-112-1/+6
| * Fix for ActionMailer::Base.method_missing so that it raises NoMethodError whe...Joel Chippindale2008-11-112-6/+16
| * Remove redundant uniqFrederick Cheung2008-11-111-1/+1
* | Remove superfluous requireJeremy Kemper2008-11-131-1/+0
* | Merge branch 'master' into testingJeremy Kemper2008-11-130-0/+0
|\ \
| * | Move fixtures settings from AR::TestCase to railties test_helpJeremy Kemper2008-11-132-5/+16
| |/
* | Move fixtures settings from AR::TestCase to railties test_helpJeremy Kemper2008-11-122-19/+15
* | Remove deprecated Gem.manage_gemsJeremy Kemper2008-11-121-1/+0
* | Prefer a feature check to a version checkJeremy Kemper2008-11-121-1/+1
* | Merge branch 'master' into testingJeremy Kemper2008-11-117-42/+69
|\|
| * Only track new constant definitions when we're reloading dependenciesJeremy Kemper2008-11-102-7/+15
| * Eliminate excess Regexp creation due to capture countingJeremy Kemper2008-11-102-4/+26
| * Pare down object creation during route buildingJeremy Kemper2008-11-102-30/+27
| * Add simple case when DB calculations returns 0 instead of 0.0 [#1346 state:re...Joshua Peek2008-11-101-1/+1
* | Ruby 1.9 compat: check for minitest's assertion alsoJeremy Kemper2008-11-081-3/+3
* | lazy-initialize already loaded fixtures mapJeremy Kemper2008-11-081-1/+1
* | Ruby 1.9 compat: rescue Exception since minitest's assertion doesn't subclass...Jeremy Kemper2008-11-081-2/+2
* | Wrap straggling mocha user with uses_mocha blockJeremy Kemper2008-11-081-5/+7
* | Ruby 1.9 compat: CGI switched back to TempfileJeremy Kemper2008-11-081-10/+4
* | Workaround lack of Mocha on 1.9 (hasn't been updated for minitest yet)Jeremy Kemper2008-11-081-1/+2
* | Merge branch 'master' into testingJeremy Kemper2008-11-084-8/+66
|\|
| * Move sshpublisher require into the rake tasks that use it so ruby 1.9 and mac...Jeremy Kemper2008-11-081-1/+2
| * Add some basic controller logging testsPratik Naik2008-11-081-0/+46
| * Timeout the connection pool monitor on ruby 1.8 onlyJeremy Kemper2008-11-082-7/+18
* | Merge branch 'master' into testingJeremy Kemper2008-11-071-1/+1
|\|
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-071-1/+1
| |\
| | * If average value from DB is 0, make sure to convert it to a 0.0 float before ...Ken Collins2008-11-071-1/+1
* | | Merge branch 'master' into testingJeremy Kemper2008-11-071-0/+1
|\| |
| * | Work around ruby 1.9 segfaultJeremy Kemper2008-11-071-0/+1
| * | Don't worry about attribute orderingJeremy Kemper2008-11-071-1/+2
| * | Check whether last arg is a Hash instead of duck-typing against []Jeremy Kemper2008-11-071-4/+9
| * | Use delete if the rhs is nilJeremy Kemper2008-11-071-1/+5
| |/
* | Merge branch 'master' into testingJeremy Kemper2008-11-079-20/+33
|\|
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-079-20/+33
| |\
| | * Don't leave open dangling connections in development mode. [#1335 state:resol...Pratik Naik2008-11-081-2/+1
| | * Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. ...Nick Sieger2008-11-082-5/+1
| | * auto_link view helper was failing on URLs with colons after a query paramRich Manalang2008-11-072-2/+3
| | * Added tests for HABTM associations with counter_sqlTekin Suleyman2008-11-071-0/+23
| | * Added :counter_sql as a valid key for habtm associationsTekin Suleyman2008-11-071-1/+1
| | * Revert commit which breaks all the tests.Michael Koziarski2008-11-072-10/+4
* | | Check whether last arg is a Hash instead of duck-typing against []Jeremy Kemper2008-11-071-4/+9
* | | Don't worry about attribute orderingJeremy Kemper2008-11-071-1/+2
* | | Use delete if the rhs is nilJeremy Kemper2008-11-071-1/+5