Emilio Tagua 8ee0b44148 Merge remote branch 'rails/master' into identity_map ... Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/relations_test.rb		2011-02-15 12:01:04 -03:00
..
application	Merge remote branch 'rails/master' into identity_map	2011-02-15 12:01:04 -03:00
fixtures	create_dummy_app method that allows to easily create dummy application from template	2010-11-02 17:14:53 +01:00
generators	Correct migration name the test is looking to match.	2011-02-04 20:25:13 -02:00
isolation	Simplify remove_from_config.	2010-11-19 19:09:00 -03:00
railties	Failing test for #6388	2011-02-09 12:19:08 +01:00
abstract_unit.rb	Rails.application is set anyway, we don't need to set it manually, this was purpose of different behavior in tests and in application	2010-09-25 10:46:22 +02:00
backtrace_cleaner_test.rb	Use backtrace cleaner for dev mode exception page	2010-01-16 21:34:35 -06:00
generators_test.rb	Allow generators nested in more than one level	2011-01-12 21:42:56 -02:00
initializable_test.rb	Remove run_initializers from class methods.	2010-06-24 11:40:22 +02:00
paths_test.rb	Provide a cleaner syntax for paths configuration that does not rely on method_missing.	2010-10-06 17:20:15 +02:00
rails_info_controller_test.rb	Moves local_request? to require.local?	2010-08-13 17:35:52 -03:00
rails_info_test.rb	Takes out stale methods relating to edge_rails_version	2010-05-16 17:21:29 +02:00
script_rails_loader_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