Yehuda Katz 3030bc90c9 Merge commit 'rails/3-0-unstable' ...

Conflicts:

	actionpack/lib/action_controller/base.rb
	actionpack/lib/action_dispatch/http/mime_type.rb
	actionpack/lib/action_dispatch/http/request.rb
	actionpack/lib/action_view/base.rb
	actionpack/lib/action_view/paths.rb
	actionpack/test/controller/session/cookie_store_test.rb
	actionpack/test/dispatch/rack_test.rb
	actionpack/test/dispatch/request_test.rb

2009-01-30 11:30:27 -08:00

..

addresses

Purge empty files

2007-09-11 19:54:06 +00:00

alternate_helpers

Allow helpers directory to be overridden via ActionController::Base.helpers_dir (Sam Pohlenz) [#1424 state:committed]

2008-11-23 13:42:53 +01:00

bad_customers

Missed adds. References #11491.

2008-04-01 00:56:59 +00:00

content_type

test default content type for implicit rjs template render

2006-09-18 16:32:41 +00:00

customers

Ooops. Add fixture partials for last commit

2008-02-08 22:33:17 +00:00

db_definitions

Added test for has_one partial rendering (keeran) [#43 state:resolved]

2008-04-30 14:59:24 -05:00

developers

Improve test coverage and create fixtures for RenderPartialWithRecordIdentificationTests

2008-07-12 12:17:10 -05:00

fun

Improve test coverage and create fixtures for RenderPartialWithRecordIdentificationTests

2008-07-12 12:17:10 -05:00

functional_caching

Improved test coverage for fragment cache helper

2008-07-15 20:54:17 -05:00

good_customers

Missed adds. References #11491.

2008-04-01 00:56:59 +00:00

helpers

Added helper(:all) as a way to include all helpers from app/helpers/**/*.rb in ApplicationController [DHH]

2007-02-24 20:31:34 +00:00

layout_tests

Begin unifying the interface between ActionController and ActionView

2009-01-22 16:18:10 -06:00

layouts

Ensure @content_for_* is checked before yielding to block in render :layout [#8994 state:resolved]

2008-10-28 17:31:33 -05:00

mascots

Forgot these

2008-04-30 15:00:59 -05:00

multipart

Allow empty files to be uploaded

2009-01-20 20:34:35 -06:00

override/test

Purge empty files

2007-09-11 19:54:06 +00:00

override2/layouts/test

add missing layouts from [7321]

2007-08-15 21:12:50 +00:00

post_test

Fixed the layout defaults (closes #9564) [lifo]

2007-09-28 01:23:20 +00:00

projects

Improve test coverage and create fixtures for RenderPartialWithRecordIdentificationTests

2008-07-12 12:17:10 -05:00

public

Add :recursive option to javascript_include_tag and stylesheet_link_tag to be used along with :all. [#480 state:resolved]

2008-07-08 13:50:59 +01:00

replies

Improve test coverage and create fixtures for RenderPartialWithRecordIdentificationTests

2008-07-12 12:17:10 -05:00

respond_to

Please do remember

2007-09-25 16:40:56 +00:00

scope/test

Purge empty files

2007-09-11 19:54:06 +00:00

symlink_parent

Fix layouts in symlinked paths. Closes #9136 [court3nay, caio]

2008-03-28 20:54:26 +00:00

test

Restore implicit rendering for XHR requests that want a HTML template [#1590 state:resolved]

2009-01-27 14:09:11 -06:00

topics

Ooops. Add fixture partials for last commit

2008-02-08 22:33:17 +00:00

_top_level_partial_only.erb

Fix rendering partials at the top level [#795 state:resolved]

2008-08-13 19:15:35 -05:00

_top_level_partial.html.erb

Fix rendering partials at the top level [#795 state:resolved]

2008-08-13 19:15:35 -05:00

companies.yml

* Fix pagination problems when using include

2006-02-09 09:17:40 +00:00

company.rb

Added test for has_one partial rendering (keeran) [#43 state:resolved]

2008-04-30 14:59:24 -05:00

developer.rb

Fixed that has_many :through associations should render as collections too (closes #9051) [mathie/danger]

2007-11-12 15:02:12 +00:00

developers_projects.yml

* Fix pagination problems when using include

2006-02-09 09:17:40 +00:00

developers.yml

* Fix pagination problems when using include

2006-02-09 09:17:40 +00:00

mascot.rb

Forgot these

2008-04-30 15:00:59 -05:00

mascots.yml

Forgot these

2008-04-30 15:00:59 -05:00

project.rb

* Fix pagination problems when using include

2006-02-09 09:17:40 +00:00

projects.yml

* Fix pagination problems when using include

2006-02-09 09:17:40 +00:00

replies.yml

Remove the irrelevant fixture added in fe6ffce51d

2009-01-24 18:22:17 +00:00

reply.rb

Fixed render :partial => @collection.named_scope (nkallen) [#61 state:resolved]

2008-04-30 14:42:44 -05:00

shared.html.erb

Fixed render :template for templates in top level of view path. [#54 state:resolved]

2008-05-01 10:21:46 +01:00

topic.rb

render :partial recognizes Active Record associations as Arrays. Closes #8538.

2007-06-01 03:53:39 +00:00

topics.yml

* Fix pagination problems when using include

2006-02-09 09:17:40 +00:00