This project is archived and is in readonly mode.
Changeset [1cc44599397e061901cd59233397129625839a60] by Emilio Tagua
Revision 1cc44599397e061901cd59233397129625839a60,
committed by Emilio Tagua
· May 19th, 2009 @ 12:01 AM
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record.rb
Updated:
Arel submodule
http://github.com/rails/rails/commit/1cc44599397e061901cd5923339712...
18 changed files
-
M
actionpack/lib/action_controller/base/http_authentication.rb -
M
actionpack/lib/action_view/helpers/active_record_helper.rb -
M
actionpack/lib/action_view/helpers/text_helper.rb -
M
actionpack/test/abstract_controller/layouts_test.rb -
M
actionpack/test/controller/http_digest_authentication_test.rb -
M
actionpack/test/template/text_helper_test.rb -
M
activerecord/lib/active_record.rb -
M
activerecord/lib/active_record/associations/has_many_through_association.rb -
M
activerecord/lib/active_record/base.rb -
M
activerecord/lib/active_record/fixtures.rb -
M
activerecord/lib/active_record/validations.rb -
M
activerecord/test/cases/associations/has_many_through_associations_test.rb -
M
activerecord/test/cases/fixtures_test.rb -
M
activerecord/test/cases/method_scoping_test.rb -
M
activerecord/test/models/developer.rb -
M
activesupport/lib/active_support/cache/mem_cache_store.rb -
M
activesupport/lib/active_support/multibyte/chars.rb -
M
activesupport/test/caching_test.rb