Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into wip_abstract_controller | Yehuda Katz + Carl Lerche | 2009-05-11 | 59 | -732/+607 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 9 | -13/+24 |
| | | |||||
| * | assert_redirect_to's partial hash matching was deprecated in 2-3 stable ↵ | Joshua Peek | 2009-05-04 | 1 | -7/+0 |
| | | | | | | | | 7f1f16c01 | ||||
| * | Wrap dispatcher callbacks around the whole middleware chain. Kill ↵ | Joshua Peek | 2009-05-03 | 3 | -38/+22 |
| | | | | | | | | unnecessary Reloader middleware. | ||||
| * | Show lazy middleware args in pretty print | Joshua Peek | 2009-05-03 | 1 | -2/+1 |
| | | |||||
| * | Extract ActionController rescue templates into Rescue and ShowExceptions ↵ | Joshua Peek | 2009-05-02 | 28 | -556/+403 |
| | | | | | | | | | | middleware. This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public. | ||||
| * | Fix implicit ordering expectation | Jeremy Kemper | 2009-05-02 | 1 | -1/+1 |
| | | |||||
| * | Deprecate Controller.process interface | Joshua Peek | 2009-05-02 | 3 | -10/+13 |
| | | |||||
| * | Switch functional tests to run through the rack interface instead of process | Joshua Peek | 2009-05-02 | 7 | -10/+28 |
| | | |||||
| * | Functional test runner finalizes response just like the integration test ↵ | Joshua Peek | 2009-05-02 | 9 | -58/+66 |
| | | | | | | | | | | 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 | 8 | -28/+26 |
| | | |||||
* | | Fixed a bug with handling render options | Yehuda Katz + Carl Lerche | 2009-05-11 | 3 | -66/+12 |
| | | |||||
* | | Aliased AbstractController::ActionNotFound to ActionController::UnknownAction | Yehuda Katz + Carl Lerche | 2009-05-11 | 4 | -10/+12 |
| | | |||||
* | | Ported ConditionalGet to new Base | Yehuda Katz + Carl Lerche | 2009-05-11 | 7 | -5/+102 |
| | | |||||
* | | 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 | 5 | -0/+92 |
| | | |||||
* | | More community code review :) | Yehuda Katz | 2009-05-11 | 8 | -43/+37 |
| | | |||||
* | | Fix implicit ordering expectation | Jeremy Kemper | 2009-05-02 | 1 | -1/+1 |
| | | |||||
* | | Implement FooController.action(:name) | Yehuda Katz | 2009-05-02 | 7 | -34/+57 |
| | | | | | | | | | | | | * 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 | 3 | -17/+10 |
| | | |||||
* | | Renamed Base2 to Base and don't require old action_controller for new Base | Yehuda Katz + Carl Lerche | 2009-05-01 | 13 | -141/+157 |
| | | |||||
* | | Starting to get new_base to run on old tests | Yehuda Katz + Carl Lerche | 2009-05-01 | 8 | -3/+313 |
| | | |||||
* | | 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 | 4 | -8/+8 |
| | | |||||
* | | Committing the last changes before we start trying to get the old tests to ↵ | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -7/+70 |
| | | | | | | | | pass on the new base | ||||
* | | Ported over the concept of public instance methods on controller child ↵ | Yehuda Katz + Carl Lerche | 2009-05-01 | 5 | -20/+69 |
| | | | | | | | | classes as callable action methods | ||||
* | | Move ContentType inline for now. | Yehuda Katz + Carl Lerche | 2009-05-01 | 4 | -21/+6 |
| | | | | | | | | Trying to avoid premature proliferation of modules. | ||||
* | | Support implicit and explicit content types | Yehuda Katz + Carl Lerche | 2009-05-01 | 6 | -2/+139 |
| | | |||||
* | | Support implicit render and blank render | Yehuda Katz + Carl Lerche | 2009-05-01 | 6 | -27/+69 |
| | | |||||
* | | Ported over render :template tests | Yehuda Katz + Carl Lerche | 2009-05-01 | 6 | -8/+39 |
| | | |||||
* | | Finished implementing render :text in Base2 | Yehuda Katz + Carl Lerche | 2009-05-01 | 6 | -8/+54 |
| | | |||||
* | | Renamed the new_base tests | Yehuda Katz + Carl Lerche | 2009-05-01 | 4 | -94/+98 |
| | | |||||
* | | Renamed ActionController::AbstractBase to ActionController::Http | Yehuda Katz + Carl Lerche | 2009-05-01 | 4 | -18/+18 |
| | | |||||
* | | OMG, a lot of work | Yehuda Katz + Carl Lerche | 2009-05-01 | 19 | -86/+210 |
|/ | |||||
* | Added routing test for irregular ID requirements and custom member action. | Ruy Asan | 2009-05-01 | 1 | -0/+8 |
| | | | | | | [#2595 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Rename vendor/rack to vendor/rack-1.1.pre | Pratik Naik | 2009-05-01 | 52 | -2/+2 |
| | |||||
* | Vendor Rack edge ( commit : 815342a8e15db564b766f209ffb1e340233f064f ) | Pratik Naik | 2009-05-01 | 52 | -1/+5418 |
| | |||||
* | Update some old tests to use AC TestProcess | Joshua Peek | 2009-04-30 | 1 | -12/+13 |
| | |||||
* | alias method chain process with test | Joshua Peek | 2009-04-30 | 2 | -5/+8 |
| | |||||
* | Move TestRequest#query_parameters into AD TestRequest | Joshua Peek | 2009-04-30 | 3 | -13/+7 |
| | |||||
* | 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 | 3 | -5/+36 |
| | |||||
* | Depend on unreleased rack 1.1 | Joshua Peek | 2009-04-30 | 5 | -334/+2 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-04-30 | 2 | -1/+12 |
|\ | |||||
| * | Fix render :json => nil [#2589 state:resolved] | Jeremy Kemper | 2009-04-30 | 2 | -1/+12 |
| | |