aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use explicit method definition instead of metaprogramming.Emilio Tagua2009-08-181-11/+16
* Relation#joins! should know what to join instead of delegating toEmilio Tagua2009-08-181-7/+13
* Fix typo in test classname.Emilio Tagua2009-08-181-1/+1
* Use finder options as relation method names to provide more familiarEmilio Tagua2009-08-187-68/+81
* Clean up relation joins when finding records with included associations.Emilio Tagua2009-08-171-12/+12
* Merge commit 'rails/master'Emilio Tagua2009-08-1723-246/+158
|\
| * Remove support for SQLite 2.Pratik Naik2009-08-179-107/+19
| * k, thats really slow, lets notJoshua Peek2009-08-161-8/+0
| * Cleanup route reloading in tests. Prefer with_routing over using ActionContro...Joshua Peek2009-08-1614-139/+147
* | Merge commit 'rails/master'Emilio Tagua2009-08-1741-1143/+619
|\|
| * Fixes ActionMailer regression [#3059 state:resolved]Yehuda Katz2009-08-151-1/+1
| * Missing fixture template -- fixes AP testsYehuda Katz2009-08-151-0/+1
| * Fix test_has_many_through_polymorphic_has_one on sqlite2 [#3054 state:resolved]Jay Pignata2009-08-151-1/+1
| * Fix calculation tests on sqlite2 [#3053 state:resolved]Jay Pignata2009-08-151-1/+1
| * Bump pg gem requirement to 0.8.0. Build psql db with UTF8 encoding.Jeremy Kemper2009-08-152-3/+3
| * Adding a call to logger from params_parser to give detailed debug information...Jay Pignata2009-08-153-5/+46
| * Axe "best fit" generation supportJoshua Peek2009-08-152-39/+2
| * Normalize route generation order: associations, yield block, then own routes.Jeremy Kemper2009-08-151-9/+9
| * Got tests to pass with some more changes.Yehuda Katz2009-08-1520-127/+123
| * Caches and cache clearing seems to actually work, but the actual architecture...Yehuda Katz2009-08-155-57/+144
| * More cleanup of ActionView and reduction in need for blocks in some cases:Yehuda Katz2009-08-159-42/+14
| * Clean up ActionView some:Yehuda Katz2009-08-156-75/+56
| * Fix ActiveResource load test for 64bit machines [#3051 state:resolved]Jatinder Singh2009-08-151-3/+3
| * Skip isolation test tests when using MiniTestJeremy Kemper2009-08-151-2/+4
| * Attempt to rewrite most of the highly coupled router segments testsJoshua Peek2009-08-141-741/+221
| * Kill routing timed testsJoshua Peek2009-08-141-50/+3
* | Remove group when building the relation, it will be added later ifEmilio Tagua2009-08-161-1/+0
* | Don't use regular rinder on calculations since scoping order blowsEmilio Tagua2009-08-141-1/+7
* | Merge commit 'rails/master'Emilio Tagua2009-08-1449-603/+506
|\|
| * Break up concerns for choosing what attributes should be serialized and the a...Joshua Peek2009-08-138-163/+136
| * Use safe tmp dirJoshua Peek2009-08-132-0/+2
| * Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-08-1342-546/+555
| |\
| | * make mysql and postgresql rebuild databases on every CI build, to prevent bre...Chad Woolley2009-08-121-2/+2
| | * Remove submoduleYehuda Katz2009-08-112-3/+0
| | * Made benchmarks submodule so it's easier to keep in syncYehuda Katz2009-08-1112-219/+3
| | * Allow superclass_delegating_accessor to take a block for initial set.Yehuda Katz2009-08-111-3/+4
| | * More perf work:Yehuda Katz2009-08-1111-100/+128
| | * Got overhead down from 127 to 85. All tests pass:Yehuda Katz2009-08-115-42/+65
| | * Tentatively accept the ":as or :object, but not both" solutionYehuda Katz2009-08-112-23/+22
| | * Make large_collection 1,000 partialsYehuda Katz2009-08-111-10/+10
| | * Further experimentation. Was able to cut the cost of rendering 100 partials i...Yehuda Katz2009-08-114-20/+65
| | * Add a few more benchesYehuda Katz2009-08-111-0/+12
| | * Add some more caching to the lookupYehuda Katz2009-08-113-18/+38
| | * This change causes some failing tests, but it should be possible to make them...Yehuda Katz2009-08-113-15/+20
| * | Ensure collections are not treated as nested resources.José Valim2009-08-134-18/+36
| * | Use less strict rules in generators lookup, so people can lay their generator...José Valim2009-08-107-68/+64
* | | Use ARel's joins when building a query for finding records with includedEmilio Tagua2009-08-145-79/+93
* | | Merge commit 'rails/master'Emilio Tagua2009-08-111-0/+18
|\ \ \ | | |/ | |/|
| * | Add tests for hm:t#push failuresPratik Naik2009-08-111-0/+18
* | | Merge commit 'rails/master'Emilio Tagua2009-08-102-5/+21
|\| |