Fix ActionPack build on Windows: we really should not test anything regarding symlinks on Windows.

Preload uses exclusive scope [#643 state:resolved]

Association preloading no longer stops if it hits a nil object [#1630 state:resolved]

MaKe Hash#slice! return removed values, akin to Array [#971 state:resolved]

Fix assert_select_rjs not checking id for inserts [#540 state:resolved]

Fix randomly failing cookie store tests

Merge commit 'mainstream/master'

Merge docrails

Don't recurse when ActionController#render is called without any arguments

Make ActionController#render(symbol) behave same as ActionController#render(string) [#1435]

Make ActionController#render(string) work as a shortcut for render :action => string. [#1435]

Make ActionController#render(string) work as a shortcut for render :template => string. [#1435]

Make ActionController#render(string) work as a shortcut for render :file => string. [#1435]

Move ActionController::Base#render arguments validation to a separate method

Make render_test.rb run in isolation

Undry ActionController::TestCase#<HTTP_METHODS> for better documentation

Move request parsing related code to ActionController::RequestParser

ActionController::VerbPiggybacking middleware

Remove duplicate attr_reader :env

Unify ActionController::AbstractRequest and ActionController::Request

Use Rack::MockRequest for TestRequest

Rename RackRequest to Request

Remove rack_process.rb

Remove deprecated relative_url_root

Defining a new method is atomic, no mutex needed.

Move default middleware stack to middlewares.rb

ActiveRecord::QueryCache middleware

Use I18n for date/time select helpers prompt text [#561 state:resolved]

Add :allow_nil option to delegate [#1127 state:resolved]

Ensure Model#last doesn't affects order for another finders inside the same scope [#1499 state:resolved]

Added prompt options to date helpers [#561 state:resolved]

Ensure the template format is always passed to the template finder. Now we can cleanup some nasty stuff.

Merge commit 'fred/more_pullable'

Allow use of symbols for :type option of ActionController::Streaming#send_file/#send_data [#1232 state:resolved]

Fix script/dbconsole not handling numeric password [#1395 state:resolved]

Correct description of tmp:create task [#1607 state:resolved] [Roderick van Domburg]

Fix configure_dependency_for_has_many not quoting conditions properly [#1461 state:resolved]

Use explicit order to stop test failing randomly

Fix failing cookie store test

Remove observe_field :on option as prototype no longer supports it [#1088 state:resolved]

Remove dead commented out code [#1467 state:resolved]

Switch to Rack::Response#set_cookie instead of using CGI::Cookie to build cookie headers

Fix Mime::Type#=~ not using Regexp.quote

Add missing fixture to allow reload models test to run isolated [#1609 state:resolved]

Fix duplicate test name [#1058 state:resolved] [Dave Rothlisberger, Pratik Naik]

Rename AbstractResponse to Response and inheirt from Rack::Response

Process CGI 'cookie' header into 'Set-Cookie' for all responses.

Improve cookie test coverage

Use status response accessor instead of the 'Status' header

Diverge Metal implementation from Rack::Cascade since we want the last app to return its headers and body if the status is a 404.