This project is archived and is in readonly mode.
Changeset [e5b8c4483c8de805d5847563edcf4e5d7e035a87] by Emilio Tagua
Revision e5b8c4483c8de805d5847563edcf4e5d7e035a87,
committed by Emilio Tagua
· July 1st, 2009 @ 12:12 AM
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/base.rb
http://github.com/rails/rails/commit/e5b8c4483c8de805d5847563edcf4e...
31 changed files
-
A
activesupport/lib/active_support/testing/isolation.rb -
A
activesupport/test/isolation_test.rb -
A
railties/lib/rails/paths.rb -
A
railties/test/initializer/path_test.rb -
A
railties/test/initializer/root/config/database.yml -
A
railties/test/paths_test.rb -
M
actionmailer/Rakefile -
M
actionmailer/lib/action_mailer/version.rb -
M
actionpack/Rakefile -
M
actionpack/lib/action_controller/base/filter_parameter_logging.rb -
M
actionpack/lib/action_pack/version.rb -
M
actionpack/lib/action_view/helpers/form_tag_helper.rb -
M
actionpack/test/controller/filter_params_test.rb -
M
actionpack/test/template/form_tag_helper_test.rb -
M
activerecord/Rakefile -
M
activerecord/lib/active_record/base.rb -
M
activerecord/lib/active_record/version.rb -
M
activerecord/test/cases/reflection_test.rb -
M
activeresource/Rakefile -
M
activeresource/lib/active_resource/version.rb -
M
activesupport/lib/active_support/test_case.rb -
M
activesupport/lib/active_support/testing/declarative.rb -
M
activesupport/lib/active_support/testing/setup_and_teardown.rb -
M
activesupport/lib/active_support/version.rb -
M
railties/Rakefile -
M
railties/lib/initializer.rb -
M
railties/lib/rails/configuration.rb -
M
railties/lib/rails/version.rb -
M
railties/lib/railties_path.rb -
M
railties/lib/test_help.rb -
M
railties/test/abstract_unit.rb