1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/railties/test/application/initializers
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
..
boot_test.rb Refactor railties test, break huge files in smaller chunks and move initializers to application folder. 2010-01-26 13:57:11 +01:00
check_ruby_version_test.rb abort generation/booting on Ruby 1.9.1 2010-06-10 21:49:45 +02:00
frameworks_test.rb Fix typo. 2010-11-19 19:09:00 -03:00
hooks_test.rb Fixed two failing tests in railties on 1.9.2-head [#4609 state:commited] 2010-05-16 10:47:03 +02:00
i18n_test.rb Additionally trigger i18n configuration setup before any eager loading [#6353 state:resolved] 2011-02-01 15:35:48 -02:00
load_path_test.rb Revert "files in the lib directory are no longer autoloaded" 2010-06-21 01:46:24 +02:00
notifications_test.rb Fix a failing test in Railtie and properly define all severity levels in MockLogger for LogSubscriber. 2010-07-20 21:21:14 +02:00