This project is archived and is in readonly mode.

Changeset [85b1a55f6d296f79c81e81c2ec90370504c1b0e1] by Jeremy Kemper

April 23rd, 2009 @ 02:54 AM

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

Committed by Jeremy Kemper

  • M actionmailer/lib/action_mailer/base.rb
  • M actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mail.rb
  • M actionmailer/test/fixtures/auto_layout_mailer/multipart.html.erb
  • M actionmailer/test/fixtures/auto_layout_mailer/multipart.text.erb
  • M actionmailer/test/fixtures/auto_layout_mailer/multipart.text.html.erb
  • M actionmailer/test/fixtures/auto_layout_mailer/multipart.text.plain.erb
  • M actionmailer/test/fixtures/test_mailer/_subtemplate.text.erb
  • M actionmailer/test/fixtures/test_mailer/_subtemplate.text.plain.erb
  • M actionmailer/test/fixtures/test_mailer/custom_templating_extension.html.haml
  • M actionmailer/test/fixtures/test_mailer/custom_templating_extension.text.haml
  • M actionmailer/test/fixtures/test_mailer/custom_templating_extension.text.html.haml
  • M actionmailer/test/fixtures/test_mailer/custom_templating_extension.text.plain.haml
  • M actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.html.erb
  • M actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.html.erb~
  • M actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.erb
  • M actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb
  • M actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb~
  • M actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.erb
  • M actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.erb
  • M actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.yaml.erb
  • M actionmailer/test/fixtures/test_mailer/included_subtemplate.text.erb
  • M actionmailer/test/fixtures/test_mailer/included_subtemplate.text.plain.erb
  • M actionmailer/test/fixtures/test_mailer/rxml_template.builder
  • M actionmailer/test/mail_service_test.rb
  • M actionpack/lib/action_controller/abstract/layouts.rb
  • M actionpack/lib/action_controller/abstract/renderer.rb
  • M actionpack/lib/action_controller/base/layout.rb
  • M actionpack/lib/action_controller/base/render.rb
  • M actionpack/lib/action_view/paths.rb
  • M actionpack/lib/action_view/render/partials.rb
  • M actionpack/lib/action_view/render/rendering.rb
  • M actionpack/lib/action_view/template/handlers.rb
  • M actionpack/lib/action_view/template/path.rb
  • M actionpack/lib/action_view/template/template.rb
  • M actionpack/test/abstract_controller/abstract_controller_test.rb
  • M actionpack/test/template/render_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>