1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Commit graph

14 commits

Author SHA1 Message Date
José Valim
47e5caa96b Merge Mail with latest Rails and move mail gem to Gemfile. 2009-12-27 12:09:20 +01:00
José Valim
4964d3b02c Make ActionMailer::Base inherit from AbstractController::Base
Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
2009-12-22 11:29:06 -08:00
Mikel Lindsaar
418639b4cf Fixes for working with 1.9.1-head 2009-12-17 12:00:32 +11:00
Mikel Lindsaar
186cd7bc53 Merge branch 'rails'
Conflicts:
	actionmailer/lib/action_mailer.rb
	actionmailer/lib/action_mailer/delivery_method/smtp.rb
2009-12-17 11:24:02 +11:00
Joshua Peek
6ac32a8328 Define a welcome controller in mailer tests 2009-11-29 18:28:45 -06:00
Mikel Lindsaar
539d9b355f More updates... 45 errors left to get it working with Mail gem 2009-11-20 14:10:57 +11:00
Mikel Lindsaar
15d7cac282 Starting again on actionmailer integration with mail 2009-11-12 16:08:50 +11:00
Joshua Peek
3ccaabc6c6 Need to use "use_controllers" for nonexistent controller in AM test 2009-10-18 10:39:21 -05:00
Jeremy Kemper
1ad87adc9f require abstract_unit directly since test is in load path
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8565 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-01-05 13:32:22 +00:00
David Heinemeier Hansson
57cde63138 Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) (closes #10033) [zdennis]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8111 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-11-07 16:05:17 +00:00
Michael Koziarski
2283524dff Test which fails without [8052] [Koz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8053 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-29 04:13:51 +00:00
Michael Koziarski
7573791284 Disable the routing optimisation code when dealing with foo_url helpers. Add test to actionmailer to expose the problem they introduced. References #9450 [Koz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7572 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 19:20:06 +00:00
Jamis Buck
45b5555f4c Make mime version default to 1.0. closes #2323
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5081 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-09-09 21:56:38 +00:00
David Heinemeier Hansson
c064802de9 Automatically included ActionController::UrlWriter, such that URL generation can happen within ActionMailer controllers. [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4818 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-08-25 06:48:15 +00:00