aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into cherryJeremy Kemper2009-04-2011-35/+38
|\|
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-2011-35/+38
| |\
| | * Ensure :dependent => :delete_all works for association with hash conditionsPratik Naik2009-04-204-9/+14
| | |
| | * Ensure JoinAssociation uses aliased table name when multiple associations ↵Pratik Naik2009-04-205-5/+12
| | | | | | | | | | | | have hash conditions on the same table
| | * Always buffer rack.input if it is not rewindableMislav Marohnić2009-04-174-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-172-4/+2
| | | | | | | | | | | | | | | | | | middleware Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | | Merge branch 'master' into cherryJeremy Kemper2009-04-20321-3022/+6746
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/CHANGELOG activesupport/lib/active_support/core_ext/class/delegating_attributes.rb activesupport/lib/active_support/core_ext/hash/conversions.rb activesupport/lib/active_support/core_ext/module/attribute_accessors.rb activesupport/lib/active_support/core_ext/string/multibyte.rb activesupport/lib/active_support/core_ext/time/calculations.rb activesupport/lib/active_support/deprecation.rb
| * | Clearer String#first and #last edge cases. Fix that 'foo'.first(0) == 'foo' ↵Jeremy Kemper2009-04-201-2/+14
| | | | | | | | | | | | instead of ''
| * | Treating strings as enumerable is deprecatedJeremy Kemper2009-04-201-6/+6
| | |
| * | render_for_text pushes a body part instead of replacing the whole bodyJeremy Kemper2009-04-172-10/+12
| | |
| * | Don't set Content-Length in Base#response_body= since body may be any ↵Jeremy Kemper2009-04-171-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 Kemper2009-04-176-14/+14
| | | | | | | | | | | | Rack-compatible body, not just strings
| * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-1710-32/+121
| |\|
| | * Merge docrailslifo2009-04-1710-32/+121
| | |
| * | Clearer String#first and #last edge cases. Fix that foo.first(0) == instead ↵Jeremy Kemper2009-04-172-3/+17
| |/ | | | | | | of foo.
| * Added :touch option to belongs_to associations that will touch the parent ↵David Heinemeier Hansson2009-04-166-29/+110
| | | | | | | | record when the current record is saved or destroyed [DHH]
| * Added ActiveRecord::Base#touch to update the updated_at/on attributes with ↵David Heinemeier Hansson2009-04-163-9/+64
| | | | | | | | the current time [DHH]
| * Make more Template methods public to make ActionMailer tests passCarl Lerche & Yehuda Katz2009-04-162-9/+9
| |
| * Don't check authenticity tokens for any AJAX requestsRoss Kaffenburger and Bryan Helmkamp2009-04-153-6/+10
| |
| * Makes rails-dev-boost work againCarl Lerche & Yehuda Katz2009-04-1412-120/+126
| |
| * Move middleware stack out of utils folderJoshua Peek2009-04-141-1/+1
| |
| * Make dispatcher instances immutableJoshua Peek2009-04-141-3/+14
| |
| * Final blow to CGIJoshua Peek2009-04-141-14/+3
| |
| * We aren't using UploadedStringIO and UploadedTempfile anymoreJoshua Peek2009-04-141-1/+1
| |
| * Move all Templates methods not used by other class into private toCarl Lerche & Yehuda Katz2009-04-141-87/+88
| | | | | | | | define surface area of the class.
| * Move MimeResponds into base folderJoshua Peek2009-04-142-1/+1
| |
| * Move reloader middleware in ActionDispatchJoshua Peek2009-04-144-6/+6
| |
| * Session management belongs in base folderJoshua Peek2009-04-142-1/+1
| |
| * Move middleware stack out of utils folderJoshua Peek2009-04-142-2/+1
| |
| * Backwords compat alias for ActionController::Request and ↵Joshua Peek2009-04-142-0/+3
| | | | | | | | ActionController::Response
| * Use rack's status code list as a baseJoshua Peek2009-04-141-67/+19
| |
| * Make dispatcher instances immutableJoshua Peek2009-04-142-14/+10
| |
| * Final blow to CGIJoshua Peek2009-04-146-268/+2
| |
| * We aren't using UploadedStringIO and UploadedTempfile anymoreJoshua Peek2009-04-144-51/+28
| |
| * Move bundled rack into ActionDispatchJoshua Peek2009-04-1453-13/+7
| |
| * Fix requires so tests runJeremy Kemper2009-04-141-2/+2
| |
| * Rails server boots againCarl Lerche & Yehuda Katz2009-04-132-2/+2
| |
| * Resurrecting 1.9 compatibility.Carl Lerche & Yehuda Katz2009-04-138-10/+15
| |
| * 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 03:19:10 +0000