This project is archived and is in readonly mode.

Changeset [acb1624f2732a4fcfa006c3e8694020635baba6b] by Jeremy Kemper

October 20th, 2009 @ 02:37 AM

Merge commit 'josevalim/fixes'

Conflicts:

railties/test/generators/app_generator_test.rb

http://github.com/rails/rails/commit/acb1624f2732a4fcfa006c3e869402...

Committed by Jeremy Kemper

  • A actionpack/test/template/active_model_helper_i18n_test.rb
  • A actionpack/test/template/active_model_helper_test.rb
  • R actionpack/test/template/active_record_helper_i18n_test.rb
  • R actionpack/test/template/active_record_helper_test.rb
  • M actionpack/lib/action_controller/metal/mime_responds.rb
  • M actionpack/lib/action_view/helpers/active_model_helper.rb
  • M actionpack/lib/action_view/locale/en.yml
  • M actionpack/test/controller/mime_responds_test.rb
  • M activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
  • M activesupport/lib/active_support/core_ext/object/duplicable.rb
  • M railties/lib/rails/generators/active_model.rb
  • M railties/lib/rails/generators/active_record.rb
  • M railties/lib/rails/generators/rails/app/templates/Gemfile
  • M railties/lib/rails/generators/resource_helpers.rb
  • M railties/test/generators/app_generator_test.rb
  • M railties/test/generators/scaffold_controller_generator_test.rb

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »

<h2 style="font-size: 14px">Tickets have moved to Github</h2>

The new ticket tracker is available at <a href="https://github.com/rails/rails/issues">https://github.com/rails/rails/issues</a>