aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-05-1610-42/+125
|\
| * Ported Rescuable to new baseYehuda Katz + Carl Lerche2009-05-158-25/+101
| |
| * Refactored AbstractController to provide better hook points for overriding ↵Yehuda Katz + Carl Lerche2009-05-154-29/+36
| | | | | | | | aspects of action dispatching
* | Merge commit 'mainstream/master'Pratik Naik2009-05-1551-2059/+1088
|\| | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb
| * Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-144-2/+12
| |\ | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb
| | * Minimal base/new_base comparisonJeremy Kemper2009-05-144-4/+16
| | |
| * | Got new base to pass controller/base_test.rb, implemented method_missing ↵Yehuda Katz + Carl Lerche2009-05-146-9/+59
| | | | | | | | | | | | action semantics in compatibility mode, and fixed a few action_missing bugs.
| * | Cleaning up more render testsYehuda Katz + Carl Lerche2009-05-142-0/+12
| |/
| * Cherry-pick core extensionsJeremy Kemper2009-05-138-6/+21
| |
| * Implemented redirects and partial rendering in new base.Yehuda Katz + Carl Lerche2009-05-1213-47/+185
| |
| * Fixed new callbacks to not call the action when a callback sets the response ↵Yehuda Katz + Carl Lerche2009-05-121-1/+1
| | | | | | | | body
| * Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-1126-407/+174
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/callbacks.rb actionpack/lib/action_controller/abstract/renderer.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_controller/dispatch/dispatcher.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/testing/process.rb actionpack/test/abstract_controller/layouts_test.rb actionpack/test/controller/filters_test.rb actionpack/test/controller/helper_test.rb actionpack/test/controller/render_test.rb actionpack/test/new_base/test_helper.rb
| | * Revert "Whitespace!"Yehuda Katz + Carl Lerche2009-05-1114-84/+95
| | | | | | | | | | | | This reverts commit a747ab5b20b9d543e9d311070e3b720c761ae716.
| | * 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 ↵Joshua Peek2009-05-031-23/+22
| | | | | | | | | | | | unnecessary Reloader middleware.
| | * Extract ActionController rescue templates into Rescue and ShowExceptions ↵Joshua Peek2009-05-0213-328/+61
| | | | | | | | | | | | | | | middleware. This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public.
| | * Deprecate Controller.process interfaceJoshua Peek2009-05-021-0/+1
| | |
| | * Switch functional tests to run through the rack interface instead of processJoshua Peek2009-05-025-9/+22
| | |
| | * Functional test runner finalizes response just like the integration test ↵Joshua Peek2009-05-021-1/+4
| | | | | | | | | | | | | | | runner. In both runners, the @response object will now behave the same. Some functional tests will need to be updated if they are relying on preprocessed data on the response.
| | * Deprecate assert_redirect_to's partial hash matchingJoshua Peek2009-05-023-14/+9
| | |
| * | 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-115-1/+96
| | |
| * | Don't run the action if callbacks are halted.Yehuda Katz + Carl Lerche2009-05-111-1/+1
| | | | | | | | | In AbstractController, this means that response_body is not empty
| * | Ported fresh_when into a ConditionalGet moduleYehuda Katz + Carl Lerche2009-05-114-0/+45
| | |
| * | More community code review :)Yehuda Katz2009-05-113-12/+4
| | |
| * | Implement FooController.action(:name)Yehuda Katz2009-05-024-20/+26
| | | | | | | | | | | | | | | | | | * Rails actions are now Rack endpoints, and can be retrieved via FooController.action(name) and called with an env * Updated some tests that relied on the old internal #process/#call implementation
| * | 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-014-45/+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
| | |
| * | Ported over the concept of public instance methods on controller child ↵Yehuda Katz + Carl Lerche2009-05-012-15/+47
| | | | | | | | | | | | classes as callable action methods
| * | Move ContentType inline for now. Yehuda Katz + Carl Lerche2009-05-013-20/+6
| | | | | | | | | | | | Trying to avoid premature proliferation of modules.
| * | Support implicit and explicit content typesYehuda Katz + Carl Lerche2009-05-012-0/+16
| | |
| * | Support implicit render and blank renderYehuda Katz + Carl Lerche2009-05-013-11/+15
| | |
| * | Ported over render :template testsYehuda Katz + Carl Lerche2009-05-013-7/+1
| | |
| * | Finished implementing render :text in Base2Yehuda Katz + Carl Lerche2009-05-013-7/+16
| | |
| * | Renamed ActionController::AbstractBase to ActionController::HttpYehuda Katz + Carl Lerche2009-05-012-2/+2
| | |
| * | OMG, a lot of workYehuda Katz + Carl Lerche2009-05-017-9/+27
| |/
| * alias method chain process with testJoshua Peek2009-04-301-3/+6
| |
| * Move TestRequest#query_parameters into AD TestRequestJoshua Peek2009-04-301-12/+2
| |
| * Set rack.input instead of RAW_POST_DATA in TestRequestJoshua Peek2009-04-301-28/+11
| |
| * Missed stray @request_uriJoshua Peek2009-04-301-2/+0
| |
| * Move TestRequest cookies accessor into AD TestRequestJoshua Peek2009-04-301-2/+0
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-301-1/+2
| |\
| | * Fix render :json => nil [#2589 state:resolved]Jeremy Kemper2009-04-301-1/+2
| | |