Jon Leighton 735844db71 Merge branch 'master' into nested_has_many_through ...

Conflicts:
	activerecord/CHANGELOG
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
	activerecord/lib/active_record/associations/has_many_association.rb
	activerecord/lib/active_record/associations/has_many_through_association.rb
	activerecord/lib/active_record/associations/has_one_association.rb
	activerecord/lib/active_record/associations/has_one_through_association.rb
	activerecord/lib/active_record/associations/through_association_scope.rb
	activerecord/lib/active_record/reflection.rb
	activerecord/test/cases/associations/has_many_through_associations_test.rb
	activerecord/test/cases/associations/has_one_through_associations_test.rb
	activerecord/test/cases/reflection_test.rb
	activerecord/test/cases/relations_test.rb
	activerecord/test/fixtures/memberships.yml
	activerecord/test/models/categorization.rb
	activerecord/test/models/category.rb
	activerecord/test/models/member.rb
	activerecord/test/models/reference.rb
	activerecord/test/models/tagging.rb

2011-03-04 09:30:27 +00:00

..

controller_fixtures

New routes implementation. Simpler, faster, easier to understand. The published API for config/routes.rb is unchanged, but nearly everything else is different, so expect breakage in plugins and libs that try to fiddle with routes.

2006-06-01 15:42:08 +00:00

deprecation

Extract ActionController rescue templates into Rescue and ShowExceptions middleware.

2009-05-02 23:02:22 -05:00

new_base

Use Mime::Type references.

2011-02-08 14:14:26 -08:00

request

cleaning up some warnings on 1.9.3

2011-02-07 16:44:27 -08:00

action_pack_assertions_test.rb

fix warning during test execution

2010-11-17 20:19:07 -02:00

addresses_render_test.rb

Fix isolated running of AddressesTest

2009-09-06 21:42:05 -05:00

assert_select_test.rb

Exception handling more readable

2010-09-19 12:18:51 -07:00

base_test.rb

Removed deprecated RouteSet API, still many tests fail

2010-09-05 13:44:36 +02:00

caching_test.rb

Merge branch 'master' into nested_has_many_through

2011-03-04 09:30:27 +00:00

capture_test.rb

Test correct method behaviour.

2010-09-29 12:42:51 -03:00

content_type_test.rb

Deprecate old template handler API. Remove old handlers.

2010-10-10 01:14:50 +02:00

filters_test.rb

cleaning up some warnings on 1.9.3

2011-02-07 16:44:27 -08:00

flash_test.rb

Remove deprecated stuff in ActionController

2010-09-26 02:13:45 +08:00

helper_test.rb

Cleanup deprecation warnings in Action Controller

2010-09-06 13:40:45 +02:00

http_basic_authentication_test.rb

Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)

2010-08-14 04:12:33 -03:00

http_digest_authentication_test.rb

Rename config.cookie_secret to config.secret_token and pass it as configuration in request.env. This is another step forward removing global configuration.

2010-04-05 12:00:24 +02:00

http_token_authentication_test.rb

Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)

2010-08-14 04:12:33 -03:00

integration_test.rb

use a method that actually exists

2010-10-01 17:54:50 -07:00

layout_test.rb

Deprecate old template handler API. Remove old handlers.

2010-10-10 01:14:50 +02:00

localized_templates_test.rb

Fixed that default locale templates should be used if the current locale template is missing [DHH]

2010-04-08 18:11:26 -07:00

log_subscriber_test.rb

cleaning up some warnings on 1.9.3

2011-02-07 16:44:27 -08:00

mime_responds_test.rb

fixing wrong test

2011-01-17 14:43:29 -08:00

output_escaping_test.rb

code gardening: we have assert_(nil|blank|present), more concise, with better default failure messages - let's use them

2010-08-17 03:32:11 +02:00

record_identifier_test.rb

moving fake model to the correct file

2010-10-03 14:40:06 -07:00

redirect_test.rb

delete repeated code

2010-10-01 18:01:34 -07:00

render_js_test.rb

Namespace TestControllers inside their test case class

2009-09-19 13:04:12 -05:00

render_json_test.rb

render_to_string must ensure that response_body

2011-01-25 20:14:03 +01:00

render_other_test.rb

Initialize ivars in tests.

2010-09-28 17:32:18 -03:00

render_test.rb

Ensure render is case sensitive even on systems with case-insensitive filesystems.

2011-02-08 14:04:19 -08:00

render_xml_test.rb

Removed deprecated RouteSet API, still many tests fail

2010-09-05 13:44:36 +02:00

request_forgery_protection_test.rb

Change the CSRF whitelisting to only apply to get requests

2011-02-08 14:57:08 -08:00

rescue_test.rb

removing more duplicate code

2010-10-01 18:05:59 -07:00

resources_test.rb

Cleanup deprecation warnings in Action Controller

2010-09-06 13:40:45 +02:00

routing_test.rb

cleaning up some warnings on 1.9.3

2011-02-07 16:44:27 -08:00

runner_test.rb

adding a test for the runner module [#6027 state:resolved]

2010-11-22 15:57:03 -08:00

selector_test.rb

Rename duplicated test name.

2010-09-27 11:19:24 -03:00

send_file_test.rb

Use assert_respond_to because it has better error messaging

2010-05-18 02:12:06 +02:00

test_test.rb

Use parentheses when using assert_match followed by a regexp to avoid warnings.

2010-09-27 11:19:19 -03:00

url_for_test.rb

Protocol-relative URL support.

2011-02-02 19:09:44 -02:00

url_rewriter_test.rb

Removed deprecated RouteSet API, still many tests fail

2010-09-05 13:44:36 +02:00

view_paths_test.rb

Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)

2010-08-14 04:12:33 -03:00

webservice_test.rb

use spec compliant YAML

2011-01-21 15:43:34 -08:00