This project is archived and is in readonly mode.

Changeset [74fd17346f30fddba0e174ae17f5697f2c22279e] by rick

Revision 74fd17346f30fddba0e174ae17f5697f2c22279e, committed by Repository · May 13th, 2008 @ 05:41 PM

Merge branch 'master' of git@github.com:rails/rails

http://github.com/rails/rails/co...

72 changed files

A activerecord/test/migrations/duplicate_names/20080507052938_chunky.rb
A activerecord/test/migrations/duplicate_names/20080507053028_chunky.rb
A activerecord/test/models/guid.rb
M actionmailer/CHANGELOG
M actionmailer/MIT-LICENSE
M actionmailer/Rakefile
M actionmailer/lib/action_mailer.rb
M actionmailer/lib/action_mailer/version.rb
M actionpack/CHANGELOG
M actionpack/MIT-LICENSE
M actionpack/Rakefile
M actionpack/lib/action_controller.rb
M actionpack/lib/action_controller/cgi_ext/cookie.rb
M actionpack/lib/action_controller/flash.rb
M actionpack/lib/action_controller/request_forgery_protection.rb
M actionpack/lib/action_controller/rescue.rb
M actionpack/lib/action_controller/session/cookie_store.rb
M actionpack/lib/action_controller/session_management.rb
M actionpack/lib/action_pack.rb
M actionpack/lib/action_pack/version.rb
M actionpack/lib/action_view.rb
M actionpack/lib/action_view/helpers/javascripts/controls.js
M actionpack/lib/action_view/helpers/javascripts/dragdrop.js
M actionpack/lib/action_view/helpers/javascripts/effects.js
M actionpack/lib/action_view/helpers/sanitize_helper.rb
M actionpack/test/controller/cookie_test.rb
M actionpack/test/controller/request_forgery_protection_test.rb
M actionpack/test/controller/session/cookie_store_test.rb
M actionpack/test/controller/session_management_test.rb
M actionpack/test/controller/test_test.rb
M activerecord/CHANGELOG
M activerecord/MIT-LICENSE
M activerecord/Rakefile
M activerecord/lib/active_record.rb
M activerecord/lib/active_record/association_preload.rb
M activerecord/lib/active_record/base.rb
M activerecord/lib/active_record/dirty.rb
M activerecord/lib/active_record/migration.rb
M activerecord/lib/active_record/named_scope.rb
M activerecord/lib/active_record/validations.rb
M activerecord/lib/active_record/version.rb
M activerecord/test/cases/associations/eager_test.rb
M activerecord/test/cases/associations/has_many_associations_test.rb
M activerecord/test/cases/dirty_test.rb
M activerecord/test/cases/migration_test.rb
M activerecord/test/cases/named_scope_test.rb
M activerecord/test/cases/validations_test.rb
M activerecord/test/models/author.rb
M activerecord/test/models/pirate.rb
M activerecord/test/schema/schema.rb
M activeresource/CHANGELOG
M activeresource/Rakefile
M activeresource/lib/active_resource/version.rb
M activesupport/CHANGELOG
M activesupport/MIT-LICENSE
M activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
M activesupport/lib/active_support/deprecation.rb
M activesupport/lib/active_support/json.rb
M activesupport/lib/active_support/version.rb
M activesupport/test/deprecation_test.rb
M pushgems.rb
M railties/CHANGELOG
M railties/MIT-LICENSE
M railties/Rakefile
M railties/html/javascripts/controls.js
M railties/html/javascripts/dragdrop.js
M railties/html/javascripts/effects.js
M railties/lib/commands/dbconsole.rb
M railties/lib/dispatcher.rb
M railties/lib/rails/version.rb
M railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
M railties/lib/tasks/databases.rake