aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
* Make more Template methods public to make ActionMailer tests passCarl Lerche & Yehuda Katz2009-04-161-1/+1
|
* Makes rails-dev-boost work againCarl Lerche & Yehuda Katz2009-04-141-1/+1
|
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-1311-27/+57
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| * Prepare for final 2.3 releaseDavid Heinemeier Hansson2009-03-153-6/+3
| |
| * Allow custom type for multipart emails [#1691 state:resolved]Sean Dague2009-03-102-2/+30
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ruby 1.9 compat: rename deprecated assert_raises to assert_raise.Jeremy Kemper2009-03-083-6/+6
| | | | | | | | [#1617 state:resolved]
| * Release RC2 todayDavid Heinemeier Hansson2009-03-051-1/+1
| |
| * Removed the "charset" parameter from the Content-Type header of multipart ↵Elliott Wood2009-03-022-1/+5
| | | | | | | | | | | | | | sections of nested multipart messages. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2109 state:committed]
| * So it didnt happen yesterday, but very soon! Just need the final details ↵David Heinemeier Hansson2009-02-281-1/+1
| | | | | | | | ironed out
| * Prep for RC2 later todayDavid Heinemeier Hansson2009-02-273-3/+3
| |
| * Just require tmail instead of autoloading it to fix issues when using the gemMarcus Mateus2009-02-241-1/+2
| | | | | | | | | | version [#1851 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * load plugin view_paths to action_mailer view_paths and make action_mailer ↵Sven Fuchs2009-02-221-1/+3
| | | | | | | | | | | | use them [#2031 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fix a failing mailer test.thedarkone2009-02-201-1/+1
| |
| * Port fast reloadable templates from rails-dev-boost.thedarkone2009-02-122-1/+2
| |
| * Fixed that ActionMailer should send correctly formatted Return-Path in MAIL ↵Matt Jones2009-02-053-1/+7
| | | | | | | | | | | | FROM for SMTP [#1842 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Require rubygemsJeremy Kemper2009-02-031-1/+1
| |
| * Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha.Jeremy Kemper2009-02-032-11/+3
| |
| * Mark CHANGELOGs for releaseDavid Heinemeier Hansson2009-02-011-1/+1
| |
* | Begin unifying the interface between ActionController and ActionViewYehuda Katz2009-01-222-27/+64
|/
* Bump up the year in MIT license filesPratik Naik2009-01-182-2/+2
|
* Add ActionMailer::Base#enable_starttls_auto option for enabling/disabling ↵Jose' Valim2009-01-182-7/+25
| | | | | | STARTTLS. [#1731 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Make ActioMailer quoting test play nice with Ruby 1.9 [#1726 state:resolved]Mike Gunderloy2009-01-161-2/+4
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Clean up view path cruft and split path implementations into Template::Path ↵Joshua Peek2008-12-291-1/+0
| | | | and Template::EagerPath
* Ensure the template format is always passed to the template finder. Now we ↵Joshua Peek2008-12-212-4/+9
| | | | can cleanup some nasty stuff.
* Merge docrailsPratik Naik2008-12-191-0/+1
|
* normalize author names in changelogs [#1495 state:committed]Xavier Noria2008-12-161-8/+8
| | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Fix tests broken by switch to PathnameJeremy Kemper2008-12-091-3/+3
|
* Register bogus template handlers for ActionMailer test fixturesJoshua Peek2008-12-032-0/+10
|
* Removed deprecated register_template_extensionJoshua Peek2008-12-021-6/+0
|
* Ensure ActionMailer doesn't blow up when a two argument proc is set for the ↵Tekin Suleyman2008-12-012-0/+55
| | | | | | | asset host Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1394 state:committed]
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-251-0/+2
|\
| * Ensure ActionView will be available to ActionMailer if ActionController is ↵Joshua Peek2008-11-251-0/+2
| | | | | | | | not loaded
* | Explicitly require Action View alsoJeremy Kemper2008-11-241-0/+2
|/
* Add config.preload_frameworks to load all frameworks at startup. Default to ↵Jeremy Kemper2008-11-241-2/+0
| | | | false so Rails autoloads itself as it's used.
* Add LAZY env flag for testing autoload/lazy load featureJoshua Peek2008-11-241-2/+1
|
* Remove explicit tmail requires in favor of autoloadJeremy Kemper2008-11-232-3/+0
|
* use autoload instead of explicit requires for ActionMailerJoshua Peek2008-11-2310-47/+63
|
* ActionMailer should respect content type when choosing layoutsColin Curtin2008-11-215-2/+33
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Fixed RFC-2045 quoted-printable bug [#1421 state:committed]Alexey Mahotkin2008-11-203-2/+4
| | | | | | | | | | | | | | | http://www.faqs.org/rfcs/rfc2045.html says: may be represented by an "=" followed by a two digit hexadecimal representation of the octet's value. The digits of the hexadecimal alphabet, for this purpose, are "0123456789ABCDEF". Uppercase letters must be used; lowercase letters are not allowed. ActionMailer, however, used "=%02x" specification. Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Assume that the next version is going to be 2.3 for nowDavid Heinemeier Hansson2008-11-193-4/+4
|
* Merge branch 'master' into testingJeremy Kemper2008-11-156-11/+37
|\
| * Added lambda merging to OptionMerger (especially useful with named_scope and ↵David Heinemeier Hansson2008-11-153-1/+12
| | | | | | | | with_options) [#740 state:commited] (Paweł Kondzior)
| * A few more dependency updatesDavid Heinemeier Hansson2008-11-141-1/+1
| |
| * Prepare for RC2David Heinemeier Hansson2008-11-142-2/+2
| |
| * Fixed method_missing for ActionMailer so it no longer matches methods where ↵Joel Chippindale2008-11-112-1/+6
| | | | | | | | | | | | deliver or create are not a suffix [#1318 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fix for ActionMailer::Base.method_missing so that it raises NoMethodError ↵Joel Chippindale2008-11-112-6/+16
| | | | | | | | | | | | when no method is found [#1330 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Ruby 1.9 compat: check for minitest's assertion alsoJeremy Kemper2008-11-081-3/+3
|/
* Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and ↵Grant Hollingworth2008-11-064-4/+29
| | | | | | the SMTP server supports it [#1336 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Update CHANGELOGs with the last few fixes, set date for todayDavid Heinemeier Hansson2008-10-241-1/+1
|
* Proper update call for gem serverDavid Heinemeier Hansson2008-10-231-1/+1
|