aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added documentation of ActiveRecord configuration options to Configuration ↵Mike Gunderloy2008-11-151-41/+33
| | | | Guide.
* Fix markup for cattr_accessors in ActiveRecord to work with RDoc 2+.Mike Gunderloy2008-11-154-7/+34
|
* Additional details on config.gem processing for 2.2 release notesMike Gunderloy2008-11-152-2/+8
|
* Typo fix in 2.2 relnotes (core ticket #1378)Mike Gunderloy2008-11-152-2/+2
|
* Update info on routing parameter defaults, better example for :requirements ↵Matt Jones2008-11-142-3/+10
| | | | in map.resource.
* Getting a few recent changes into 2.2 release notes.Mike Gunderloy2008-11-142-2/+17
|
* Please dont change code. 4146efc380255319768031f26e63210fd4158e99Pratik Naik2008-11-141-2/+0
|
* Merge commit 'mainstream/master'Pratik Naik2008-11-1466-219/+758
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/doc/guides/html/actioncontroller_basics.html railties/doc/guides/html/activerecord_validations_callbacks.html railties/doc/guides/html/debugging_rails_applications.html railties/doc/guides/html/testing_rails_applications.html railties/doc/guides/source/actioncontroller_basics/methods.txt railties/doc/guides/source/actioncontroller_basics/params.txt railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt railties/doc/guides/source/actioncontroller_basics/session.txt railties/doc/guides/source/activerecord_validations_callbacks.txt railties/doc/guides/source/debugging_rails_applications.txt railties/doc/guides/source/testing_rails_applications.txt
| * Rails now requires rubygems 1.3.1 of higher.Pratik Naik2008-11-141-1/+1
| |
| * 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
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | Prepare for RC2David Heinemeier Hansson2008-11-1412-18/+14
| |/
| * Make polymorphic_url compact given array [#1317 state:committed]hiroshi2008-11-143-1/+14
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Revert "Move fixtures settings from AR::TestCase to railties test_help" -- ↵David Heinemeier Hansson2008-11-142-16/+13
| | | | | | | | | | | | it broke all the tests! This reverts commit 9a88ab64bb45ddb2bdcf80fab9203111d8f8abb4.
| * Fix typo in pool_conections_test [#1350 state:committed]Amos King2008-11-141-1/+1
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Properly check silence_spec_warnings class variable [#1372 state:committed]Chris Wanstrath2008-11-141-2/+2
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * 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 ↵Hongli Lai (Phusion)2008-11-133-5/+11
| | | | | | | | omitting the attribute, if the associated option is false but not nil.
| * Fix map.resources to always generate named routes if they're neededTom Stuart2008-11-132-6/+85
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Make sure any Fixnum returned by a DB sum is type cast to a Float before ↵Ken Collins2008-11-132-1/+6
| | | | | | | | | | | | standard converstion to a BigDecimal [#8994 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Merge branch 'master' of git@github.com:rails/railsgbuesing2008-11-135-61/+92
| |\
| | * Instead of overriding html_types, base the verification on ↵Michael Koziarski2008-11-132-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | browser_generated_types. Also Deprecate the old unverifiable types. [#1145 state:committed]
| | * fix two MimeType failing test casesrick2008-11-132-7/+10
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Changed request forgery protection to only worry about HTML-formatted ↵Jeff Cohen2008-11-134-55/+70
| | | | | | | | | | | | | | | | | | content requests. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | TimeZone: fix base offset for Sri Jayawardenepura. Anchor tests for zone ↵gbuesing2008-11-133-3/+5
| |/ | | | | | | offsets to more current date
| * 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
| | | | | | | | | | | | | | This allows people with huge numbers of resource routes to cut down on the memory consumption caused by the generated code. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1215 state:committed]
| * Fixed method_missing for ActionMailer so it no longer matches methods where ↵Joel Chippindale2008-11-112-1/+6
| | | | | | | | | | | | deliver or create are not a suffix [#1318 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fix for ActionMailer::Base.method_missing so that it raises NoMethodError ↵Joel Chippindale2008-11-112-6/+16
| | | | | | | | | | | | when no method is found [#1330 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * 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 ↵Joshua Peek2008-11-101-1/+1
| | | | | | | | state:resolved]
| * Move sshpublisher require into the rake tasks that use it so ruby 1.9 and ↵Jeremy Kemper2008-11-081-1/+2
| | | | | | | | macruby don't need the rake gem installed
| * 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
| | | | | | | | | | | | | | | | | | calling #to_d on it [#1346 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | 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 ↵Pratik Naik2008-11-081-2/+1
| | | | | | | | | | | | state:resolved]
| | * Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. ↵Nick Sieger2008-11-082-5/+1
| | | | | | | | | | | | | | | | | | [Nick Sieger, Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * auto_link view helper was failing on URLs with colons after a query paramRich Manalang2008-11-072-2/+3
| | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1341 state:committed]
| | * Added tests for HABTM associations with counter_sqlTekin Suleyman2008-11-071-0/+23
| | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1102 state:committed]
| | * Added :counter_sql as a valid key for habtm associationsTekin Suleyman2008-11-071-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Revert commit which breaks all the tests.Michael Koziarski2008-11-072-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8adb79b9b5983cda8dbdd4ef401661fbd51d8844. Conflicts: activerecord/CHANGELOG