aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-1830-230/+331
|\|
| * Ensure HTTP Digest auth uses appropriate HTTP method [#2490 state:resolved] [...Pratik Naik2009-05-181-1/+2
| * Allow ParamsParser to parse YAML from the request body IO directlyBrian Lopez2009-05-171-1/+1
| * Extract generic callbacks middleware from dispatcherJoshua Peek2009-05-174-61/+81
| * Merge Failsafe middleware into ShowExceptionsJoshua Peek2009-05-174-100/+40
| * Rescue hack was supposed to be removed. Some how it crept back in.Joshua Peek2009-05-172-6/+2
| * Ensure number_to_human_size does not strip zeros from the end [#1763 state:re...Travis Briggs2009-05-171-1/+6
| * Simplify filter_chain method implementation [#2327 state:resolved]Thomas E. Glasgow2009-05-171-6/+1
| * Ensure auto_link does not ignore multiple trailing punctuations [#2504 state:...Lance Ivy2009-05-171-6/+7
| * Add support for parsing XML and JSON from an IO as well as a string [#2659 st...Brian Lopez2009-05-171-5/+3
| * Ensure WhiteListSanitizer allows dl tag [#2393 state:resolved]Jeffrey Chupp2009-05-171-1/+1
| * Fix ActionMailer Symbol#to_proc instanceYehuda Katz2009-05-161-1/+1
| * Instead of checking Rails.env.test? in Failsafe middleware, check env["rails....Bryan Helmkamp2009-05-161-3/+2
| * Ported Rescuable to new baseYehuda Katz + Carl Lerche2009-05-158-25/+101
| * Refactored AbstractController to provide better hook points for overriding as...Yehuda Katz + Carl Lerche2009-05-154-29/+36
| * Allow strings to be sent as collection to select.José Valim2009-05-151-0/+2
| * Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-145-4/+16
| |\
| * | Got new base to pass controller/base_test.rb, implemented method_missing acti...Yehuda Katz + Carl Lerche2009-05-146-9/+59
| * | Cleaning up more render testsYehuda Katz + Carl Lerche2009-05-144-1/+14
* | | Active Support dependenciesJeremy Kemper2009-05-141-0/+1
| |/ |/|
* | Minimal base/new_base comparisonJeremy Kemper2009-05-144-4/+16
* | Cherry-picking Active Support extensionsJeremy Kemper2009-05-141-2/+4
|/
* Cherry-pick core extensionsJeremy Kemper2009-05-1317-40/+42
* Implemented redirects and partial rendering in new base.Yehuda Katz + Carl Lerche2009-05-1216-65/+210
* Fixed new callbacks to not call the action when a callback sets the response ...Yehuda Katz + Carl Lerche2009-05-121-1/+1
* Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-1138-349/+376
|\
| * 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-076-2/+13
| * 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-0219-230/+239
| * Deprecate Controller.process interfaceJoshua Peek2009-05-021-0/+1
| * Switch functional tests to run through the rack interface instead of processJoshua Peek2009-05-026-9/+27
| * Functional test runner finalizes response just like the integration test runn...Joshua Peek2009-05-023-14/+11
| * Deprecate assert_redirect_to's partial hash matchingJoshua Peek2009-05-026-23/+17
* | Fixed a bug with handling render optionsYehuda Katz + Carl Lerche2009-05-112-2/+11
* | Aliased AbstractController::ActionNotFound to ActionController::UnknownActionYehuda Katz + Carl Lerche2009-05-112-5/+9
* | Ported ConditionalGet to new BaseYehuda Katz + Carl Lerche2009-05-116-1/+98
* | 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-114-0/+45
* | More community code review :)Yehuda Katz2009-05-114-12/+6
* | Implement FooController.action(:name)Yehuda Katz2009-05-024-20/+26
* | 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-012-4/+8
* | Renamed Base2 to Base and don't require old action_controller for new BaseYehuda Katz + Carl Lerche2009-05-015-47/+136
* | Starting to get new_base to run on old testsYehuda Katz + Carl Lerche2009-05-014-0/+95
* | 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-013-7/+7