Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bring abstract_controller up to date with rails/master | Carl Lerche & Yehuda Katz | 2009-04-13 | 106 | -641/+6000 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 McInnes | 2009-04-07 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | added tests for session options being defaulted correctly to rack defaults ↵ | Kenny Ortmann | 2009-04-07 | 1 | -1/+7 |
| | | | | | | | | | | | | [#2403 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Merge docrails | Pratik Naik | 2009-04-05 | 2 | -18/+9 |
| | | |||||
| * | Object names with underscore do the wrong lookup in I18n on error_messages_for. | José Valim | 2009-04-05 | 1 | -1/+1 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2390 state:committed] | ||||
| * | adding session_options initialization and test [#2303 state:resolved] | Ryan Angilly | 2009-03-24 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Fix template extension parsing. [#2315 state:resolved] [#2284 state:resolved] | thedarkone | 2009-03-24 | 1 | -30/+14 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Simplify handling of absolute path templates. [#2276 state:resolved] | thedarkone | 2009-03-24 | 2 | -4/+9 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Reset request_parameters in TestRequest#recycle! to avoid multiple posts ↵ | Peter Marklund | 2009-03-24 | 1 | -0/+1 |
| | | | | | | | | | | | | clobbering each other [#2271 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Merge docrails | Pratik Naik | 2009-03-24 | 2 | -17/+24 |
| | | |||||
| * | pluginize concurrent block body part | Jeremy Kemper | 2009-03-19 | 2 | -27/+2 |
| | | |||||
| * | Merge branch 'master' into bodyparts | Jeremy Kemper | 2009-03-18 | 20 | -60/+112 |
| |\ | |||||
| | * | Merge docrails | Pratik Naik | 2009-03-16 | 3 | -4/+4 |
| | | | |||||
| | * | ruby 1.9 compat: Pathname doesn't support =~ | Joshua Peek | 2009-03-15 | 1 | -1/+1 |
| | | | |||||
| | * | Ensure our bundled version of rack is at the front of the load path | Joshua Peek | 2009-03-15 | 1 | -1/+1 |
| | | | |||||
| | * | Prepare for final 2.3 release | David Heinemeier Hansson | 2009-03-15 | 1 | -1/+1 |
| | | | |||||
| | * | allowed render :file to take Pathnames [#2220 state:resolved] | misfo | 2009-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| | * | Add Rack version to Rails info | Joshua Peek | 2009-03-14 | 1 | -2/+2 |
| | | | |||||
| | * | Fix requirements for additional member/collection routes [#2054 state:resolved] | Mike Gunderloy | 2009-03-14 | 1 | -5/+6 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| | * | Revert 5b7527ca "Failing test for routes with member & requirement" [#2054 ↵ | Joshua Peek | 2009-03-13 | 1 | -6/+1 |
| | | | | | | | | | | | | state:wontfix] | ||||
| | * | Update rack to fix multipart uploads with an empty file [#1945 state:resolved] | Joshua Peek | 2009-03-13 | 13 | -42/+98 |
| | | | |||||
| * | | Less ceremony | Jeremy Kemper | 2009-03-13 | 4 | -60/+25 |
| | | | |||||
| * | | Simplify parts and tests | Jeremy Kemper | 2009-03-13 | 3 | -25/+17 |
| | | | |||||
| * | | Example using an edge side include body part to fetch queued rendering results | Jeremy Kemper | 2009-03-13 | 1 | -13/+0 |
| | | | |||||
| * | | Body parts: future rendering, threaded future, queued future, open-uri example | Jeremy Kemper | 2009-03-13 | 5 | -2/+89 |
| | | | |||||
| * | | Extract Response#string_body? | Jeremy Kemper | 2009-03-13 | 1 | -2/+6 |
| | | | |||||
| * | | Merge branch 'master' into bodyparts | Jeremy Kemper | 2009-03-13 | 1 | -5/+5 |
| |\| | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/base.rb | ||||
| | * | Change naming to match 2.2 so life is easier on plugin developers | Jeremy Kemper | 2009-03-12 | 1 | -5/+5 |
| | | | |||||
| | * | Eliminate internal render stack since we only need its head and tail | Jeremy Kemper | 2009-03-12 | 2 | -17/+27 |
| | | | |||||
| * | | Introduce flush_output_buffer to append the buffer to the response body then ↵ | Jeremy Kemper | 2009-03-13 | 1 | -0/+8 |
| | | | | | | | | | | | | start a new buffer. Useful for pushing custom parts to the response body without disrupting template rendering. | ||||
| * | | Return body parts directly to Rack rather than building a response string ↵ | Jeremy Kemper | 2009-03-12 | 4 | -23/+40 |
| | | | | | | | | | | | | ourselves. Allows Rack middleware to orchestrate response building. | ||||
| * | | Eliminate internal render stack since we only need its head and tail | Jeremy Kemper | 2009-03-12 | 2 | -17/+27 |
| |/ | |||||
| * | Handle irregular plurals in polymorphic_urls [#2212 state:resolved] | Mike Gunderloy | 2009-03-12 | 1 | -2/+5 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Support MD5 passwords for Digest auth and use session_options[:secret] in ↵ | Donald Parish | 2009-03-12 | 1 | -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 Smith | 2009-03-11 | 7 | -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-10 | 1 | -17/+10 |
| | | | | | | | | | | | | string cache keys [#1585 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | check for rack 1.0 gem before falling back to bundled version | Joshua Peek | 2009-03-10 | 1 | -1/+6 |
| | | |||||
| * | update bundled version of rack before 2.3 final | Joshua Peek | 2009-03-10 | 10 | -11/+42 |
| | | |||||
| * | Ensure auto_link doesnt linkify URLs in the middle of a tag [#1523 ↵ | Eugene Pimenov | 2009-03-10 | 1 | -2/+3 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | reset_session should force a new session id to be generated [#2173] | Joshua Peek | 2009-03-09 | 1 | -0/+1 |
| | | |||||
| * | Ensure blank path_prefix works as expected [#2122 state:resolved] | Andrew Bloom | 2009-03-09 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fixed number_to_phone to work with 7 digit numbers [#2176 state:resolved] | rpheath | 2009-03-09 | 1 | -1/+3 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Prototype helpers support the onCreate callback. | Jeremy Kemper | 2009-03-08 | 1 | -1/+1 |
| | | | | | | | | [#1074 state:committed] | ||||
| * | Support OPTIONS verb in route conditions [#1727 state:resolved] | Mike Gunderloy | 2009-03-08 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure shallow routes respects namespace [#1356 state:resolved] | Tom Stuart | 2009-03-07 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fixed simplified render with nested models [#2042 state:resolved] | Joshua Peek | 2009-03-07 | 1 | -0/+3 |
| | | |||||
| * | fix HTML fallback for explicit templates [#2052 state:resolved] | Matt Jones | 2009-03-07 | 1 | -5/+5 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | submit_tag with confirmation and disable_with [#660 state:resolved] | Lawrence Pit | 2009-03-07 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Ensure Active Record error related view helpers escape the message [#1280 ↵ | Dan Barry | 2009-03-07 | 1 | -2/+2 |
| | | | | | | | | | | | | state:resolved] [Inge Jørgensen, Dan Barry] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure assert_select works with XML namespaced attributes [#1547 ↵ | Pratik Naik | 2009-03-07 | 1 | -1/+1 |
| | | | | | | | | state:resolved] [Jon Yurek] |