rails

mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00

Go to file

Joshua Peek 69742ca8fa Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

2009-05-29 16:06:21 -05:00

actionmailer

Fix failing CI test (broken in 2daac47 or e693f45): make test_multipart_with_template_path_with_dots only test path with dots, and stop failing on unrelated mimetype assertion. The image/jpeg multipart content type is already tested in test_explicitly_multipart_messages.

2009-05-27 21:38:23 +02:00

actionpack

Ruby 1.9: ERB template encoding using a magic comment at the top of the file

2009-05-28 17:12:48 -05:00

activemodel

Merge branch 'master' into active_model

2009-05-29 16:06:21 -05:00

activerecord

Merge branch 'master' into active_model