aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-142-19/+40
|\
| * Make inheritance of map.resources :only/:except options behave more predictablyTom Stuart2008-11-142-19/+40
* | Prepare for RC2David Heinemeier Hansson2008-11-1412-18/+14
|/
* Make polymorphic_url compact given array [#1317 state:committed]hiroshi2008-11-143-1/+14
* Revert "Move fixtures settings from AR::TestCase to railties test_help" -- it...David Heinemeier Hansson2008-11-142-16/+13
* Fix typo in pool_conections_test [#1350 state:committed]Amos King2008-11-141-1/+1
* Properly check silence_spec_warnings class variable [#1372 state:committed]Chris Wanstrath2008-11-141-2/+2
* Move fixtures settings from AR::TestCase to railties test_helpJeremy Kemper2008-11-132-13/+16
* Tag helper should output an attribute with the value 'false' instead of omitt...Hongli Lai (Phusion)2008-11-133-5/+11
* Fix map.resources to always generate named routes if they're neededTom Stuart2008-11-132-6/+85
* Make sure any Fixnum returned by a DB sum is type cast to a Float before stan...Ken Collins2008-11-132-1/+6
* 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
* 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
* 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' 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
* | 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' 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
* | Don't shadow local with black argJeremy Kemper2008-11-071-4/+4
* | Fix indentation mismatchJeremy Kemper2008-11-071-1/+1
* | Mark utf-8 encodingJeremy Kemper2008-11-071-0/+1
|/
* Fix memory leak issue in ActiveRecord scoped_methodsJoshua Peek2008-11-061-2/+1
* Increment the version of our modified memcache_client code to prevent users w...Luca Guidi2008-11-063-5/+11
* Don't eval recognize_optimized use __FILE__ and __LINE__ in the optimised rec...Aliaksey Kandratsenka2008-11-061-1/+1
* Fix stupid typoMichael Koziarski2008-11-061-1/+1
* Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and th...Grant Hollingworth2008-11-064-4/+29
* Fixed the sanitize helper to avoid double escaping already properly escaped e...David Heinemeier Hansson2008-11-060-0/+0
|\