aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-1376-183/+5300
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Fix for TestResponse.cookies returning cookies unescaped [#1867 state:resolved]Doug McInnes2009-04-071-1/+1
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * added tests for session options being defaulted correctly to rack defaults ↵Kenny Ortmann2009-04-071-1/+7
| | | | | | | | | | | | [#2403 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Merge docrailsPratik Naik2009-04-052-18/+9
| |
| * adding session_options initialization and test [#2303 state:resolved]Ryan Angilly2009-03-241-0/+1
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Reset request_parameters in TestRequest#recycle! to avoid multiple posts ↵Peter Marklund2009-03-241-0/+1
| | | | | | | | | | | | clobbering each other [#2271 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Merge branch 'master' into bodypartsJeremy Kemper2009-03-1815-54/+106
| |\
| | * Merge docrailsPratik Naik2009-03-161-1/+1
| | |
| | * Ensure our bundled version of rack is at the front of the load pathJoshua Peek2009-03-151-1/+1
| | |
| | * Add Rack version to Rails infoJoshua Peek2009-03-141-2/+2
| | |
| | * Fix requirements for additional member/collection routes [#2054 state:resolved]Mike Gunderloy2009-03-141-5/+6
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * Revert 5b7527ca "Failing test for routes with member & requirement" [#2054 ↵Joshua Peek2009-03-131-6/+1
| | | | | | | | | | | | state:wontfix]
| | * Update rack to fix multipart uploads with an empty file [#1945 state:resolved]Joshua Peek2009-03-1313-42/+98
| | |
| * | Extract Response#string_body?Jeremy Kemper2009-03-131-2/+6
| | |
| * | Return body parts directly to Rack rather than building a response string ↵Jeremy Kemper2009-03-124-23/+40
| |/ | | | | | | ourselves. Allows Rack middleware to orchestrate response building.
| * Handle irregular plurals in polymorphic_urls [#2212 state:resolved]Mike Gunderloy2009-03-121-2/+5
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Support MD5 passwords for Digest auth and use session_options[:secret] in ↵Donald Parish2009-03-121-21/+51
| | | | | | | | | | | | nonce [#2209 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Update bundled Rack to fix Litespeed compatibility [#2198 state:resolved]Russ Smith2009-03-117-10/+25
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Ensure correct content type is declared after cache hits on actions with ↵Mislav Marohnić2009-03-101-17/+10
| | | | | | | | | | | | string cache keys [#1585 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * update bundled version of rack before 2.3 finalJoshua Peek2009-03-1010-11/+42
| |
| * reset_session should force a new session id to be generated [#2173]Joshua Peek2009-03-091-0/+1
| |
| * Ensure blank path_prefix works as expected [#2122 state:resolved]Andrew Bloom2009-03-091-1/+2
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Support OPTIONS verb in route conditions [#1727 state:resolved]Mike Gunderloy2009-03-081-1/+1
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure shallow routes respects namespace [#1356 state:resolved]Tom Stuart2009-03-071-2/+2
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed simplified render with nested models [#2042 state:resolved]Joshua Peek2009-03-071-0/+3
| |
| * fix HTML fallback for explicit templates [#2052 state:resolved]Matt Jones2009-03-071-5/+5
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Ensure assert_select works with XML namespaced attributes [#1547 ↵Pratik Naik2009-03-071-1/+1
| | | | | | | | state:resolved] [Jon Yurek]
| * Remove unused variable [#1451 state:resolved] [Raphaël Valyi]Pratik Naik2009-03-071-1/+0
| |
| * Ensure expires_in without a :public key sets the Cache-Control header to ↵Johan Sørensen2009-03-071-1/+3
| | | | | | | | | | | | | | | | | | private. [#2095 state:resolved] This fixes a regression introduced in f2a32bd0, which wasn't exposed due to two test methods having the same name. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix layouts with absolute paths [#2134 state:resolved]thedarkone2009-03-051-1/+0
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Failing test for routes with member & requirement [#2054 state:resolved]Mike Gunderloy2009-03-051-1/+6
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fixed that redirection would just log the options, not the final url (which ↵David Heinemeier Hansson2009-03-051-1/+1
| | | | | | | | lead to "Redirected to #<Post:0x23150b8>") [DHH]
| * Generating routes with optional format segment does not inherit params ↵Joshua Peek2009-03-041-1/+5
| | | | | | | | format [#2043 state:resolved]
| * Allow routes with a trailing slash to be recognizedMike Gunderloy2009-03-041-1/+1
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2039 state:committed]
| * Added ability to pass in :public => true to fresh_when, stale?, and ↵Gregg Pollack2009-02-281-7/+35
| | | | | | | | | | | | expires_in to make the request proxy cachable [#2095 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Force all internal calls to Array#to_sentence to use English [#2010 ↵David Heinemeier Hansson2009-02-272-3/+3
| | | | | | | | state:resolved]
| * Ruby 1.9 compat: silence a warning about regexp languagesSam Granieri2009-02-251-1/+5
| | | | | | | | | | | | [#2050 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Ensure ActiveRecord session store's connections are checked in after each ↵Joshua Peek2009-02-241-7/+0
| | | | | | | | request [#1927 state:resolved]
| * correctly handle layouts for AJAX requests and regular js files [#2052 ↵Matt Jones2009-02-241-7/+14
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Merge with docrailsPratik Naik2009-02-242-6/+42
| |
| * Fix requirements regexp for path segmentsAndrew White2009-02-221-16/+12
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1772 state:committed]
| * Remove hardcoded number_of_capturesin ControllerSegment to allow regexp ↵Andrew White2009-02-221-4/+0
| | | | | | | | | | | | | | requirements with capturing parentheses Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1887 state:committed]
| * make action_controller/layouts pick templates from the current instance's ↵Sven Fuchs2009-02-201-32/+26
| | | | | | | | | | | | view_paths instead of the class view_paths [#1974 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Move development mode reloading up the stack to avoid issues with class ↵Joshua Peek2009-02-202-14/+41
| | | | | | | | reloading in middleware
| * Lazy evaluate middleware arguments [#2028 state:resolved]Sven Fuchs2009-02-202-3/+9
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Lazy evaluate ActionController session store middleware class to pickup ↵Joshua Peek2009-02-192-12/+7
| | | | | | | | custom plugin session stores [#2001 state:resolved]
| * Special case in deprecated CGI proxy layer for Mongrel CGI cookies [#1957 ↵Joshua Peek2009-02-161-0/+5
| | | | | | | | state:resolved]
| * Autoload ActionController::Caching::Sweeper constant [#1977 state:resolved]Joshua Peek2009-02-161-0/+1
| |
| * Removed dead convert_expires! in Response [#1952 state:resolved]Joshua Peek2009-02-161-5/+0
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fixed http digest authentication to use credentials URI passed from client. ↵Donald Parish2009-02-161-1/+1
| | | | | | | | | | | | [#1848 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 06:58:44 +0000