aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-13622-41616/+31620
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-073-1/+16
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * added tests for session options being defaulted correctly to rack defaults ↵Kenny Ortmann2009-04-073-5/+42
| | | | | | | | | | | | [#2403 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Improve tests and code for Rails::InfoController and Rails::Info [#2411 ↵Manfred Stienstra2009-04-073-32/+41
| | | | | | | | | | | | | | | | | | | | state:resolved] - Refactor Rails::InfoController tests. - Return forbidden status from the InfoController for remote requests instead of a 500. - Add tests for displaying middleware in Rails::Info. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Test cleanupGeoff Buesing2009-04-051-3/+3
| |
| * Hash::XML_TYPE_NAMES: no longer a need for a TimeWithZone entry; this class ↵Geoff Buesing2009-04-051-2/+1
| | | | | | | | will now match "Time"
| * TimeWithZone.name returns 'Time', to further thwart type checkingGeoff Buesing2009-04-053-0/+11
| |
| * Support multiple schemas in table names for postgresql [#390 state:resolved]Max Lapshin2009-04-052-1/+74
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Merge docrailsPratik Naik2009-04-059-169/+154
| |
| * Object names with underscore do the wrong lookup in I18n on error_messages_for.José Valim2009-04-052-4/+7
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2390 state:committed]
| * Ensure SqlBypass use ActiveRecord::Base connectionLuca Guidi2009-04-052-18/+29
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#https://rails.lighthouseapp.com/attachments/106066/0001-Ensure-SqlBypass-use-ActiveRecord-Base-connection.patch state:committed]
| * Nicer name for anonymous local cache middleware classJoshua Peek2009-04-021-0/+5
| |
| * Additional template render test for backup files [#2367 state:resolved]Cezary Baginski2009-04-024-0/+10
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Show installed middleware in builtin rails info (/rails/info/properties) ↵Michael Schuerig2009-04-022-2/+16
| | | | | | | | | | | | [#2396 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Enhance Time #since and #ago DST tests.Geoff Buesing2009-03-291-16/+57
| |
| * Time.local instances: Adding 24.hours across the DST boundary adds 24 hours ↵Michael Curtis2009-03-294-27/+36
| | | | | | | | instead of one day [#2066 state:resolved]
| * adding session_options initialization and test [#2303 state:resolved]Ryan Angilly2009-03-242-0/+5
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fix template extension parsing. [#2315 state:resolved] [#2284 state:resolved]thedarkone2009-03-242-30/+46
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Simplify handling of absolute path templates. [#2276 state:resolved]thedarkone2009-03-242-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 Dollar2009-03-241-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 Marklund2009-03-242-0/+9
| | | | | | | | | | | | clobbering each other [#2271 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * just kill brittle testJoshua Peek2009-03-241-21/+0
| |
| * Merge docrailsPratik Naik2009-03-2415-66/+141
| |
| * Merge branch 'master' into bodypartsJeremy Kemper2009-03-192-436/+12
| |\
| | * Ensure script/plugin doesn't show error message when svn externals are not therePratik Naik2009-03-181-4/+7
| | |
| | * Remove outdated script/plugin optionsPratik Naik2009-03-182-432/+5
| | |
| * | pluginize concurrent block body partJeremy Kemper2009-03-193-107/+2
| | |
| * | Merge branch 'master' into bodypartsJeremy Kemper2009-03-18104-1203/+2238
| |\|
| | * Try to use actionpack gem to generate guide when Rails is not vendoredPratik Naik2009-03-173-155/+19
| | |
| | * Merge docrailsPratik Naik2009-03-1648-876/+1915
| | |
| | * update rack fixture to be ruby 1.9 compatJoshua Peek2009-03-151-2/+2
| | |
| | * Better error message to try to figure out why the CI build is failingJoshua Peek2009-03-151-1/+11
| | |
| | * ruby 1.9 compat: Pathname doesn't support =~Joshua Peek2009-03-151-1/+1
| | |
| | * update rack fixture to be ruby 1.9 compatJoshua Peek2009-03-151-1/+1
| | |
| | * update metal fixtures to be ruby 1.9 compatJoshua Peek2009-03-156-6/+6
| | |
| | * Fix brittle Time.now mockJoshua Peek2009-03-151-16/+4
| | |
| | * Ensure our bundled version of rack is at the front of the load pathJoshua Peek2009-03-151-1/+1
| | |
| | * Prepare for final 2.3 releaseDavid Heinemeier Hansson2009-03-1517-44/+22
| | |
| | * Make sure Metal use ActionController class name conventions [#2242 ↵Luca Guidi2009-03-153-1/+12
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * allowed render :file to take Pathnames [#2220 state:resolved]misfo2009-03-142-1/+11
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * Add Rack version to Rails infoJoshua Peek2009-03-142-2/+6
| | |
| | * Fix requirements for additional member/collection routes [#2054 state:resolved]Mike Gunderloy2009-03-142-5/+32
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * SQLite adapters now support DDL transactions [#2080 state:resolved]Jason King2009-03-143-28/+68
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Revert 5b7527ca "Failing test for routes with member & requirement" [#2054 ↵Joshua Peek2009-03-132-14/+1
| | | | | | | | | | | | state:wontfix]
| | * Update rack to fix multipart uploads with an empty file [#1945 state:resolved]Joshua Peek2009-03-1314-43/+99
| | |
| | * Makes the gem system understand development vs. runtime dependencies [#2195 ↵David Dollar2009-03-135-152/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] The patch also fixes: * Fixes the chicken/egg problem present in the current gem system when gems are defined in the config that are not yet installed. * Remove the need to have hoe as a dependency of your production app. * Makes the gem 'unpacking' system a lot less fragile. Signed-off-by: Matt Jones <al2o3cr@gmail.com> Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Execute the appropriate gem command when using JRuby [#2215 state:resolved]Zack Hobson2009-03-131-1/+8
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Vendored gem paths now being loaded if they exist [#2204 state:resolved]John Dzak2009-03-132-0/+3
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Pare down unit testJeremy Kemper2009-03-161-36/+6
| | |
| * | Less ceremonyJeremy Kemper2009-03-135-87/+59
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 20:05:43 +0000