aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-1116-45/+304
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Wrap dispatcher callbacks around the whole middleware chain. Kill ↵Joshua Peek2009-05-031-14/+0
| | | | | | | | unnecessary Reloader middleware.
| * Show lazy middleware args in pretty printJoshua Peek2009-05-031-2/+1
| |
| * Extract ActionController rescue templates into Rescue and ShowExceptions ↵Joshua Peek2009-05-0211-7/+281
| | | | | | | | | | middleware. This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public.
| * Switch functional tests to run through the rack interface instead of processJoshua Peek2009-05-021-0/+5
| |
| * Functional test runner finalizes response just like the integration test ↵Joshua Peek2009-05-022-13/+7
| | | | | | | | | | 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-9/+8
| |
* | Renamed Base2 to Base and don't require old action_controller for new BaseYehuda Katz + Carl Lerche2009-05-011-2/+0
|/
* Rename vendor/rack to vendor/rack-1.1.prePratik Naik2009-05-0151-0/+0
|
* Vendor Rack edge ( commit : 815342a8e15db564b766f209ffb1e340233f064f )Pratik Naik2009-05-0151-0/+5412
|
* Move TestRequest#query_parameters into AD TestRequestJoshua Peek2009-04-302-1/+5
|
* Move TestRequest cookies accessor into AD TestRequestJoshua Peek2009-04-301-3/+21
|
* Depend on unreleased rack 1.1Joshua Peek2009-04-303-331/+0
|
* Start moving TestRequest and TestResponse into ActionDispatchJoshua Peek2009-04-305-73/+207
|
* Vendor new Rack::Mock changesJoshua Peek2009-04-305-148/+332
|
* Group integration test helpers and delegate other helpers to request and ↵Joshua Peek2009-04-301-0/+9
| | | | response objects
* Switch to action_dispatch rack namespace Joshua Peek2009-04-302-3/+3
|
* Move generic assertions into ActionDispatchJoshua Peek2009-04-307-0/+1115
|
* Convert params keys to stringsJeremy Kemper2009-04-291-0/+1
|
* Deprecate template, session, assigns, and layout accessors on response ↵Joshua Peek2009-04-281-3/+13
| | | | object. Instead access them through the controller instance. This mainly affects functional test assertions.
* Deprecate response.assignsJoshua Peek2009-04-281-2/+6
|
* Move header injection back into integration testsJoshua Peek2009-04-281-11/+1
|
* Delegate controller.session to request.session and deprecate response session Joshua Peek2009-04-272-9/+5
|
* Don't return bare string as rack bodyJeremy Kemper2009-04-271-2/+2
|
* Array splitting strings on newlines is deprecatedJeremy Kemper2009-04-261-4/+15
|
* Not sure why Request#session is missingJeremy Kemper2009-04-261-0/+8
|
* Don't assume :params is a HashJeremy Kemper2009-04-261-4/+1
|
* Check for to_str rather than StringJeremy Kemper2009-04-261-3/+1
|
* Inherit TestSession from Session::AbstractStore and add indifferent access ↵Joshua Peek2009-04-264-18/+34
| | | | to Session::AbstractStore.
* Fix environment variable testing code in failsafe.rb.Hongli Lai (Phusion)2009-04-261-1/+1
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Fix typo in stale session check [#2404 state:resolved]Joshua Peek2009-04-261-1/+1
|
* Move useful response test helpers into requestJoshua Peek2009-04-261-2/+63
|
* Remove RewindableInput middleware since all input MUST be rewindable ↵Joshua Peek2009-04-251-19/+0
| | | | according to a recent change in the Rack 1.0 SPEC
* Remove vendored version of RackJoshua Peek2009-04-2551-4999/+5
|
* Remove pending rack specifications until they are officialJoshua Peek2009-04-252-3/+3
|
* Start to integrate some of the features in Rack::Test.Joshua Peek2009-04-242-0/+160
| | | | Eventually commit ActionDispatch::Test::MockRequest and ActionDispatch::Test:: UploadedFile upstream.
* Opt in to JSONJeremy Kemper2009-04-221-0/+2
|
* Always buffer rack.input if it is not rewindableMislav Marohnić2009-04-171-17/+8
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Move reloader middleware in ActionDispatchJoshua Peek2009-04-141-0/+14
|
* Move middleware stack out of utils folderJoshua Peek2009-04-141-0/+0
|
* Use rack's status code list as a baseJoshua Peek2009-04-141-67/+19
|
* We aren't using UploadedStringIO and UploadedTempfile anymoreJoshua Peek2009-04-142-44/+28
|
* Move bundled rack into ActionDispatchJoshua Peek2009-04-1451-3/+4998
|
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-1310-301/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
* Handle nil QSYehuda Katz2009-03-121-1/+1
|
* Remove errant debug codeYehuda Katz2009-02-031-2/+0
|
* Merge commit 'rails/3-0-unstable'Yehuda Katz2009-02-021-1/+0
|\
| * Remove dead cgi_ext requireJeremy Kemper2009-01-311-1/+0
| |
* | Some merge cleanupYehuda Katz2009-02-021-10/+11
| |
* | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-304-28/+19
|/ | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb