Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-05-16 | 10 | -42/+125 |
|\ | |||||
| * | Ported Rescuable to new base | Yehuda Katz + Carl Lerche | 2009-05-15 | 8 | -25/+101 |
| | | |||||
| * | Refactored AbstractController to provide better hook points for overriding ↵ | Yehuda Katz + Carl Lerche | 2009-05-15 | 4 | -29/+36 |
| | | | | | | | | aspects of action dispatching | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-05-15 | 51 | -2059/+1088 |
|\| | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb | ||||
| * | Merge commit 'origin/master' | Yehuda Katz + Carl Lerche | 2009-05-14 | 4 | -2/+12 |
| |\ | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb | ||||
| | * | Minimal base/new_base comparison | Jeremy Kemper | 2009-05-14 | 4 | -4/+16 |
| | | | |||||
| * | | Got new base to pass controller/base_test.rb, implemented method_missing ↵ | Yehuda Katz + Carl Lerche | 2009-05-14 | 6 | -9/+59 |
| | | | | | | | | | | | | action semantics in compatibility mode, and fixed a few action_missing bugs. | ||||
| * | | Cleaning up more render tests | Yehuda Katz + Carl Lerche | 2009-05-14 | 2 | -0/+12 |
| |/ | |||||
| * | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 8 | -6/+21 |
| | | |||||
| * | Implemented redirects and partial rendering in new base. | Yehuda Katz + Carl Lerche | 2009-05-12 | 13 | -47/+185 |
| | | |||||
| * | Fixed new callbacks to not call the action when a callback sets the response ↵ | Yehuda Katz + Carl Lerche | 2009-05-12 | 1 | -1/+1 |
| | | | | | | | | body | ||||
| * | Merge branch 'master' into wip_abstract_controller | Yehuda Katz + Carl Lerche | 2009-05-11 | 26 | -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 Lerche | 2009-05-11 | 14 | -84/+95 |
| | | | | | | | | | | | | This reverts commit a747ab5b20b9d543e9d311070e3b720c761ae716. | ||||
| | * | Whitespace! | Joshua Peek | 2009-05-07 | 14 | -95/+84 |
| | | | |||||
| | * | Prefer "included" language over "setup" | Joshua Peek | 2009-05-07 | 5 | -15/+18 |
| | | | |||||
| | * | Make module dependency DSL opt in | Joshua Peek | 2009-05-07 | 6 | -2/+13 |
| | | | |||||
| | * | Wrap dispatcher callbacks around the whole middleware chain. Kill ↵ | Joshua Peek | 2009-05-03 | 1 | -23/+22 |
| | | | | | | | | | | | | unnecessary Reloader middleware. | ||||
| | * | Extract ActionController rescue templates into Rescue and ShowExceptions ↵ | Joshua Peek | 2009-05-02 | 13 | -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 interface | Joshua Peek | 2009-05-02 | 1 | -0/+1 |
| | | | |||||
| | * | Switch functional tests to run through the rack interface instead of process | Joshua Peek | 2009-05-02 | 5 | -9/+22 |
| | | | |||||
| | * | Functional test runner finalizes response just like the integration test ↵ | Joshua Peek | 2009-05-02 | 1 | -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 matching | Joshua Peek | 2009-05-02 | 3 | -14/+9 |
| | | | |||||
| * | | Fixed a bug with handling render options | Yehuda Katz + Carl Lerche | 2009-05-11 | 2 | -2/+11 |
| | | | |||||
| * | | Aliased AbstractController::ActionNotFound to ActionController::UnknownAction | Yehuda Katz + Carl Lerche | 2009-05-11 | 2 | -5/+9 |
| | | | |||||
| * | | Ported ConditionalGet to new Base | Yehuda Katz + Carl Lerche | 2009-05-11 | 5 | -1/+96 |
| | | | |||||
| * | | Don't run the action if callbacks are halted. | Yehuda Katz + Carl Lerche | 2009-05-11 | 1 | -1/+1 |
| | | | | | | | | | In AbstractController, this means that response_body is not empty | ||||
| * | | Ported fresh_when into a ConditionalGet module | Yehuda Katz + Carl Lerche | 2009-05-11 | 4 | -0/+45 |
| | | | |||||
| * | | More community code review :) | Yehuda Katz | 2009-05-11 | 3 | -12/+4 |
| | | | |||||
| * | | Implement FooController.action(:name) | Yehuda Katz | 2009-05-02 | 4 | -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 working | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -2/+6 |
| | | | |||||
| * | | A few more tweaks to get new Base running old render tests again | Yehuda Katz + Carl Lerche | 2009-05-01 | 2 | -4/+8 |
| | | | |||||
| * | | Renamed Base2 to Base and don't require old action_controller for new Base | Yehuda Katz + Carl Lerche | 2009-05-01 | 4 | -45/+136 |
| | | | |||||
| * | | Starting to get new_base to run on old tests | Yehuda Katz + Carl Lerche | 2009-05-01 | 4 | -0/+95 |
| | | | |||||
| * | | Add support for stripping "layouts/" from the layout name | Yehuda Katz + Carl Lerche | 2009-05-01 | 2 | -0/+8 |
| | | | |||||
| * | | Modify new_base to use String action_names for back-compat | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -7/+7 |
| | | | |||||
| * | | Ported over the concept of public instance methods on controller child ↵ | Yehuda Katz + Carl Lerche | 2009-05-01 | 2 | -15/+47 |
| | | | | | | | | | | | | classes as callable action methods | ||||
| * | | Move ContentType inline for now. | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -20/+6 |
| | | | | | | | | | | | | Trying to avoid premature proliferation of modules. | ||||
| * | | Support implicit and explicit content types | Yehuda Katz + Carl Lerche | 2009-05-01 | 2 | -0/+16 |
| | | | |||||
| * | | Support implicit render and blank render | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -11/+15 |
| | | | |||||
| * | | Ported over render :template tests | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -7/+1 |
| | | | |||||
| * | | Finished implementing render :text in Base2 | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -7/+16 |
| | | | |||||
| * | | Renamed ActionController::AbstractBase to ActionController::Http | Yehuda Katz + Carl Lerche | 2009-05-01 | 2 | -2/+2 |
| | | | |||||
| * | | OMG, a lot of work | Yehuda Katz + Carl Lerche | 2009-05-01 | 7 | -9/+27 |
| |/ | |||||
| * | alias method chain process with test | Joshua Peek | 2009-04-30 | 1 | -3/+6 |
| | | |||||
| * | Move TestRequest#query_parameters into AD TestRequest | Joshua Peek | 2009-04-30 | 1 | -12/+2 |
| | | |||||
| * | Set rack.input instead of RAW_POST_DATA in TestRequest | Joshua Peek | 2009-04-30 | 1 | -28/+11 |
| | | |||||
| * | Missed stray @request_uri | Joshua Peek | 2009-04-30 | 1 | -2/+0 |
| | | |||||
| * | Move TestRequest cookies accessor into AD TestRequest | Joshua Peek | 2009-04-30 | 1 | -2/+0 |
| | | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-04-30 | 1 | -1/+2 |
| |\ | |||||
| | * | Fix render :json => nil [#2589 state:resolved] | Jeremy Kemper | 2009-04-30 | 1 | -1/+2 |
| | | |