Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Opt in to JSON | Jeremy Kemper | 2009-04-22 | 1 | -0/+2 |
| | |||||
* | No more free lunch | Jeremy Kemper | 2009-04-22 | 3 | -0/+3 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-04-22 | 4 | -16/+80 |
|\ | |||||
| * | Fix test_rescue_routing_exceptions when running with rake | Joshua Peek | 2009-04-21 | 1 | -13/+15 |
| | | |||||
| * | refactor some coupled rescue tests | Joshua Peek | 2009-04-21 | 1 | -16/+78 |
| | | |||||
| * | Session tests belong under dispatch folder | Joshua Peek | 2009-04-21 | 3 | -0/+0 |
| | | |||||
* | | Rack::Utils.body_to_s doesn't exist in 1.0 | Jeremy Kemper | 2009-04-22 | 2 | -2/+16 |
|/ | |||||
* | Reinstate Base#render_to_string. Introduce ↵ | Jeremy Kemper | 2009-04-21 | 3 | -6/+38 |
| | | | | AbstractController#render_to_string which stringifies render_to_body. | ||||
* | Remove excess mocking from polymorphic_url tests [#2330 state:resolved] | Mike Gunderloy | 2009-04-21 | 2 | -293/+394 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-04-20 | 4 | -22/+13 |
|\ | |||||
| * | Always buffer rack.input if it is not rewindable | Mislav Marohnić | 2009-04-17 | 4 | -18/+11 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Improve rewindable input test coverage so tests fail when you remove the ↵ | Mislav Marohnić | 2009-04-17 | 2 | -4/+2 |
| | | | | | | | | | | | | middleware Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | render_for_text pushes a body part instead of replacing the whole body | Jeremy Kemper | 2009-04-17 | 2 | -10/+12 |
| | | |||||
* | | Don't set Content-Length in Base#response_body= since body may be any ↵ | Jeremy Kemper | 2009-04-17 | 1 | -1/+0 |
| | | | | | | | | Rack-compatible body. Leave it up to the content length middleware. | ||||
* | | Rename render_to_string to render_to_body since it may return any ↵ | Jeremy Kemper | 2009-04-17 | 6 | -14/+14 |
|/ | | | | Rack-compatible body, not just strings | ||||
* | Merge docrails | lifo | 2009-04-17 | 4 | -6/+6 |
| | |||||
* | Make more Template methods public to make ActionMailer tests pass | Carl Lerche & Yehuda Katz | 2009-04-16 | 1 | -8/+8 |
| | |||||
* | Don't check authenticity tokens for any AJAX requests | Ross Kaffenburger and Bryan Helmkamp | 2009-04-15 | 3 | -6/+10 |
| | |||||
* | Makes rails-dev-boost work again | Carl Lerche & Yehuda Katz | 2009-04-14 | 10 | -118/+124 |
| | |||||
* | Move middleware stack out of utils folder | Joshua Peek | 2009-04-14 | 1 | -1/+1 |
| | |||||
* | Make dispatcher instances immutable | Joshua Peek | 2009-04-14 | 1 | -3/+14 |
| | |||||
* | Final blow to CGI | Joshua Peek | 2009-04-14 | 1 | -14/+3 |
| | |||||
* | We aren't using UploadedStringIO and UploadedTempfile anymore | Joshua Peek | 2009-04-14 | 1 | -1/+1 |
| | |||||
* | Move all Templates methods not used by other class into private to | Carl Lerche & Yehuda Katz | 2009-04-14 | 1 | -87/+88 |
| | | | | define surface area of the class. | ||||
* | Move MimeResponds into base folder | Joshua Peek | 2009-04-14 | 2 | -1/+1 |
| | |||||
* | Move reloader middleware in ActionDispatch | Joshua Peek | 2009-04-14 | 4 | -6/+6 |
| | |||||
* | Session management belongs in base folder | Joshua Peek | 2009-04-14 | 2 | -1/+1 |
| | |||||
* | Move middleware stack out of utils folder | Joshua Peek | 2009-04-14 | 2 | -2/+1 |
| | |||||
* | Backwords compat alias for ActionController::Request and ↵ | Joshua Peek | 2009-04-14 | 2 | -0/+3 |
| | | | | ActionController::Response | ||||
* | Use rack's status code list as a base | Joshua Peek | 2009-04-14 | 1 | -67/+19 |
| | |||||
* | Make dispatcher instances immutable | Joshua Peek | 2009-04-14 | 2 | -14/+10 |
| | |||||
* | Final blow to CGI | Joshua Peek | 2009-04-14 | 6 | -268/+2 |
| | |||||
* | We aren't using UploadedStringIO and UploadedTempfile anymore | Joshua Peek | 2009-04-14 | 4 | -51/+28 |
| | |||||
* | Move bundled rack into ActionDispatch | Joshua Peek | 2009-04-14 | 53 | -13/+7 |
| | |||||
* | Resurrecting 1.9 compatibility. | Carl Lerche & Yehuda Katz | 2009-04-13 | 4 | -7/+10 |
| | |||||
* | Bring abstract_controller up to date with rails/master | Carl Lerche & Yehuda Katz | 2009-04-13 | 172 | -3607/+10033 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -1/+16 |
| | | | | | | | | 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 | 3 | -5/+42 |
| | | | | | | | | | | | | [#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 | 2 | -4/+7 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2390 state:committed] | ||||
| * | Ensure SqlBypass use ActiveRecord::Base connection | Luca Guidi | 2009-04-05 | 1 | -17/+28 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#https://rails.lighthouseapp.com/attachments/106066/0001-Ensure-SqlBypass-use-ActiveRecord-Base-connection.patch state:committed] | ||||
| * | Additional template render test for backup files [#2367 state:resolved] | Cezary Baginski | 2009-04-02 | 4 | -0/+10 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | adding session_options initialization and test [#2303 state:resolved] | Ryan Angilly | 2009-03-24 | 2 | -0/+5 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Fix template extension parsing. [#2315 state:resolved] [#2284 state:resolved] | thedarkone | 2009-03-24 | 2 | -30/+46 |
| | | | | | | | | 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> | ||||
| * | Updates tests to cause the tests for the Request class not to proxy through ↵ | David Dollar | 2009-03-24 | 1 | -230/+218 |
| | | | | | | | | | | | | a fake TestRequest object [#2278 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Reset request_parameters in TestRequest#recycle! to avoid multiple posts ↵ | Peter Marklund | 2009-03-24 | 2 | -0/+9 |
| | | | | | | | | | | | | clobbering each other [#2271 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | just kill brittle test | Joshua Peek | 2009-03-24 | 1 | -21/+0 |
| | | |||||
| * | Merge docrails | Pratik Naik | 2009-03-24 | 2 | -17/+24 |
| | | |||||
| * | pluginize concurrent block body part | Jeremy Kemper | 2009-03-19 | 3 | -107/+2 |
| | |