aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rails'Mikel Lindsaar2009-12-17217-2750/+3351
|\
| * Need to lazy realize middleware options so they can be modified inJoshua Peek2009-12-161-3/+3
| * Use AbstractController error constantsJoshua Peek2009-12-161-3/+2
| * Fully expand relative rails framework paths and make sure we aren'tJoshua Peek2009-12-1615-61/+62
| * Hush AMo test suiteJoshua Peek2009-12-161-1/+0
| * ARes rake task should not worry about AS being in pathJoshua Peek2009-12-161-2/+0
| * Hush ARes test suiteJoshua Peek2009-12-161-1/+0
| * Hush AM test suiteJoshua Peek2009-12-161-1/+0
| * Hush AS test suiteJoshua Peek2009-12-161-1/+0
| * When passing force_reload = true to an association, don't use the query cache...Will2009-12-162-2/+12
| * Add the ability for plugins to set default configuration settings.Carl Lerche2009-12-157-18/+142
| * Procs don't call themselvesJoshua Peek2009-12-152-1/+33
| * Add test for TimeWithZone#to_i with wrapped DateTimeGeoff Buesing2009-12-151-0/+6
| * Added #to_i to DateTime in ActiveSupport so #to_yaml works correctly on Activ...Serguei Filimonov2009-12-153-2/+28
| * Add Enumerable#exclude? to bring parity to Enumerable#include? and avoid if !...David Heinemeier Hansson2009-12-143-0/+12
| * Move route reloading into railtiesJoshua Peek2009-12-147-115/+69
| * Remove route loading tests since it should be tested by railtiesJoshua Peek2009-12-141-72/+0
| * Fix loading plugin and engine route setsJoshua Peek2009-12-142-5/+58
| * Fix response_body warning in ACJoshua Peek2009-12-141-0/+2
| * Hush loading AR unless it failsJoshua Peek2009-12-141-6/+2
| * Hush AP test suiteJoshua Peek2009-12-141-2/+0
| * Fix warning in AC flashJoshua Peek2009-12-141-0/+1
| * Fix warnings in AD::ResponseJoshua Peek2009-12-141-0/+3
| * Fix warnings in railties configuration and initializeableJoshua Peek2009-12-142-11/+15
| * Modify backtrace test to take implementations with slightly different backtra...Yehuda Katz2009-12-131-1/+1
| * Extract descendents a bit so it can take advantage of Rubinius' __subclasses__.Yehuda Katz2009-12-132-34/+45
| * Forgot to revert tests from that last commitJoshua Peek2009-12-121-8/+0
| * Revert "Fix instance_eval calls to association proxies"Joshua Peek2009-12-122-3/+6
| * rendering controller needs baseJoshua Peek2009-12-121-0/+1
| * Don't require AD test_caseJoshua Peek2009-12-122-2/+0
| * Nearly all AC modules can be deferredJoshua Peek2009-12-121-40/+44
| * All AbstractController modules are deferrableJoshua Peek2009-12-121-7/+9
| * Relocate AbstractController exceptions into their proper parent modulesJoshua Peek2009-12-124-26/+17
| * Allow autoloads to opt out of eager loadingJoshua Peek2009-12-127-36/+47
| * TestProcess belongs in ADJoshua Peek2009-12-1210-129/+109
| * Fix postgresql AR test failureJohn Pignata2009-12-111-2/+2
| * "new" and "edit" name routes always need to be prepend to theJoshua Peek2009-12-112-6/+37
| * Use rackmounts recognize api and don't piggyback recognize_path onJoshua Peek2009-12-112-21/+30
| * Remove fancy method not allowed resource exceptions since they areJoshua Peek2009-12-114-43/+9
| * Kill RouteSet#recognizeJoshua Peek2009-12-103-140/+72
| * Cleanup generate_extras build/parse messJoshua Peek2009-12-101-9/+3
| * Reduce usage of interpret_status. It should also return a integerJoshua Peek2009-12-103-24/+13
| * Add autoloads for ActionView::Template* classes, and an ActionView::TemplateE...Nathan Weizenbaum2009-12-102-1/+7
| * Merge branch 'master' of github.com:rails/railsYehuda Katz2009-12-1030-501/+520
| |\
| | * Check block arity passed to routes draw so you don't need to useJoshua Peek2009-12-092-2/+9
| | * Fixed old routing mapper example in generated routes.rbJoshua Peek2009-12-092-2/+2
| | * Scaffolding generates new routing dsl examplesJoshua Peek2009-12-098-30/+47
| | * Simpler RenderOption API -- removes the need for registering the types and ex...Carlhuda2009-12-092-56/+59
| | * More test portingJoshua Peek2009-12-083-10/+9
| | * Tack format onto resource routesJoshua Peek2009-12-082-25/+37