This project is archived and is in readonly mode.

Changeset [bf7429041e64ee0f347764a4579c8c1d14d5b391] by Rizwan Reza

June 14th, 2010 @ 09:43 AM

Merge branch 'master' of git://github.com/rails/rails
http://github.com/rails/rails/commit/bf7429041e64ee0f347764a4579c8c...

Committed by Rizwan Reza

  • A actionpack/test/fixtures/layouts/yield_with_render_inline_inside.erb
  • A railties/lib/rails/generators/rails/app/templates/app/mailers/.empty_directory
  • M actionmailer/CHANGELOG
  • M actionmailer/lib/action_mailer/base.rb
  • M actionmailer/lib/action_mailer/test_case.rb
  • M actionmailer/lib/action_mailer/test_helper.rb
  • M actionmailer/lib/rails/generators/mailer/templates/mailer.rb
  • M actionmailer/test/base_test.rb
  • M actionmailer/test/old_base/mail_service_test.rb
  • M actionpack/actionpack.gemspec
  • M actionpack/lib/action_view/base.rb
  • M actionpack/lib/action_view/render/rendering.rb
  • M actionpack/test/template/render_test.rb
  • M actionpack/test/template/text_helper_test.rb
  • M activerecord/examples/performance.rb
  • M activerecord/lib/active_record/base.rb
  • M activesupport/CHANGELOG
  • M activesupport/lib/active_support/cache/file_store.rb
  • M activesupport/lib/active_support/callbacks.rb
  • M activesupport/lib/active_support/core_ext/hash/except.rb
  • M activesupport/lib/active_support/json/decoding.rb
  • M activesupport/lib/active_support/ordered_hash.rb
  • M activesupport/test/ordered_hash_test.rb
  • M ci/ci_build.rb
  • M railties/lib/rails/generators.rb
  • M railties/lib/rails/ruby_version_check.rb
  • M railties/test/generators/app_generator_test.rb
  • M railties/test/generators/mailer_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>