aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-05-15186-2376/+9113
|\
| * Allow strings to be sent as collection to select.José Valim2009-05-152-0/+24
| * Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-147-4/+51
| |\
| | * Minimal base/new_base comparisonJeremy Kemper2009-05-146-21/+50
| | * Cherry-picking Active Support extensionsJeremy Kemper2009-05-141-2/+4
| | * Simple example for require profilingJeremy Kemper2009-05-141-0/+17
| * | Got new base to pass controller/base_test.rb, implemented method_missing acti...Yehuda Katz + Carl Lerche2009-05-148-11/+61
| * | Cleaning up more render testsYehuda Katz + Carl Lerche2009-05-1411-33/+122
| |/
| * Ported over render :file tests.Yehuda Katz + Carl Lerche2009-05-138-321/+585
| * Cherry-pick core extensionsJeremy Kemper2009-05-1323-44/+49
| * isolated_test taskJeremy Kemper2009-05-131-0/+6
| * Implemented redirects and partial rendering in new base.Yehuda Katz + Carl Lerche2009-05-1220-102/+251
| * Fixed new callbacks to not call the action when a callback sets the response ...Yehuda Katz + Carl Lerche2009-05-122-1/+20
| * Defer rake/contrib/sshpublisher require so we can use the stdlib rake instead...Jeremy Kemper2009-05-111-1/+2
| * Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-1159-732/+607
| |\
| | * Revert "Whitespace!"Yehuda Katz + Carl Lerche2009-05-1114-84/+95
| | * Whitespace!Joshua Peek2009-05-0714-95/+84
| | * Prefer "included" language over "setup"Joshua Peek2009-05-075-15/+18
| | * Make module dependency DSL opt inJoshua Peek2009-05-079-13/+24
| | * assert_redirect_to's partial hash matching was deprecated in 2-3 stable 7f1f1...Joshua Peek2009-05-041-7/+0
| | * Wrap dispatcher callbacks around the whole middleware chain. Kill unnecessary...Joshua Peek2009-05-033-38/+22
| | * Show lazy middleware args in pretty printJoshua Peek2009-05-031-2/+1
| | * Extract ActionController rescue templates into Rescue and ShowExceptions midd...Joshua Peek2009-05-0228-556/+403
| | * Fix implicit ordering expectationJeremy Kemper2009-05-021-1/+1
| | * Deprecate Controller.process interfaceJoshua Peek2009-05-023-10/+13
| | * Switch functional tests to run through the rack interface instead of processJoshua Peek2009-05-027-10/+28
| | * Functional test runner finalizes response just like the integration test runn...Joshua Peek2009-05-029-58/+66
| | * Deprecate assert_redirect_to's partial hash matchingJoshua Peek2009-05-028-28/+26
| * | Fixed a bug with handling render optionsYehuda Katz + Carl Lerche2009-05-113-66/+12
| * | Aliased AbstractController::ActionNotFound to ActionController::UnknownActionYehuda Katz + Carl Lerche2009-05-114-10/+12
| * | Ported ConditionalGet to new BaseYehuda Katz + Carl Lerche2009-05-117-5/+102
| * | Don't run the action if callbacks are halted.Yehuda Katz + Carl Lerche2009-05-111-1/+1
| * | Ported fresh_when into a ConditionalGet moduleYehuda Katz + Carl Lerche2009-05-115-0/+92
| * | More community code review :)Yehuda Katz2009-05-118-43/+37
| * | Fix implicit ordering expectationJeremy Kemper2009-05-021-1/+1
| * | Implement FooController.action(:name)Yehuda Katz2009-05-027-34/+57
| * | Get render :inline workingYehuda Katz + Carl Lerche2009-05-013-2/+6
| * | A few more tweaks to get new Base running old render tests againYehuda Katz + Carl Lerche2009-05-013-17/+10
| * | Renamed Base2 to Base and don't require old action_controller for new BaseYehuda Katz + Carl Lerche2009-05-0113-141/+157
| * | Starting to get new_base to run on old testsYehuda Katz + Carl Lerche2009-05-018-3/+313
| * | Add support for stripping "layouts/" from the layout name Yehuda Katz + Carl Lerche2009-05-012-0/+8
| * | Modify new_base to use String action_names for back-compatYehuda Katz + Carl Lerche2009-05-014-8/+8
| * | Committing the last changes before we start trying to get the old tests to pa...Yehuda Katz + Carl Lerche2009-05-013-7/+70
| * | Ported over the concept of public instance methods on controller child classe...Yehuda Katz + Carl Lerche2009-05-015-20/+69
| * | Move ContentType inline for now. Yehuda Katz + Carl Lerche2009-05-014-21/+6
| * | Support implicit and explicit content typesYehuda Katz + Carl Lerche2009-05-016-2/+139
| * | Support implicit render and blank renderYehuda Katz + Carl Lerche2009-05-016-27/+69
| * | Ported over render :template testsYehuda Katz + Carl Lerche2009-05-016-8/+39
| * | Finished implementing render :text in Base2Yehuda Katz + Carl Lerche2009-05-016-8/+54
| * | Renamed the new_base testsYehuda Katz + Carl Lerche2009-05-014-94/+98