Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make more Template methods public to make ActionMailer tests pass | Carl Lerche & Yehuda Katz | 2009-04-16 | 1 | -1/+1 |
| | |||||
* | Makes rails-dev-boost work again | Carl Lerche & Yehuda Katz | 2009-04-14 | 1 | -1/+1 |
| | |||||
* | Bring abstract_controller up to date with rails/master | Carl Lerche & Yehuda Katz | 2009-04-13 | 11 | -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 release | David Heinemeier Hansson | 2009-03-15 | 3 | -6/+3 |
| | | |||||
| * | Allow custom type for multipart emails [#1691 state:resolved] | Sean Dague | 2009-03-10 | 2 | -2/+30 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ruby 1.9 compat: rename deprecated assert_raises to assert_raise. | Jeremy Kemper | 2009-03-08 | 3 | -6/+6 |
| | | | | | | | | [#1617 state:resolved] | ||||
| * | Release RC2 today | David Heinemeier Hansson | 2009-03-05 | 1 | -1/+1 |
| | | |||||
| * | Removed the "charset" parameter from the Content-Type header of multipart ↵ | Elliott Wood | 2009-03-02 | 2 | -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 Hansson | 2009-02-28 | 1 | -1/+1 |
| | | | | | | | | ironed out | ||||
| * | Prep for RC2 later today | David Heinemeier Hansson | 2009-02-27 | 3 | -3/+3 |
| | | |||||
| * | Just require tmail instead of autoloading it to fix issues when using the gem | Marcus Mateus | 2009-02-24 | 1 | -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 Fuchs | 2009-02-22 | 1 | -1/+3 |
| | | | | | | | | | | | | use them [#2031 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Fix a failing mailer test. | thedarkone | 2009-02-20 | 1 | -1/+1 |
| | | |||||
| * | Port fast reloadable templates from rails-dev-boost. | thedarkone | 2009-02-12 | 2 | -1/+2 |
| | | |||||
| * | Fixed that ActionMailer should send correctly formatted Return-Path in MAIL ↵ | Matt Jones | 2009-02-05 | 3 | -1/+7 |
| | | | | | | | | | | | | FROM for SMTP [#1842 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Require rubygems | Jeremy Kemper | 2009-02-03 | 1 | -1/+1 |
| | | |||||
| * | Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha. | Jeremy Kemper | 2009-02-03 | 2 | -11/+3 |
| | | |||||
| * | Mark CHANGELOGs for release | David Heinemeier Hansson | 2009-02-01 | 1 | -1/+1 |
| | | |||||
* | | Begin unifying the interface between ActionController and ActionView | Yehuda Katz | 2009-01-22 | 2 | -27/+64 |
|/ | |||||
* | Bump up the year in MIT license files | Pratik Naik | 2009-01-18 | 2 | -2/+2 |
| | |||||
* | Add ActionMailer::Base#enable_starttls_auto option for enabling/disabling ↵ | Jose' Valim | 2009-01-18 | 2 | -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 Gunderloy | 2009-01-16 | 1 | -2/+4 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Clean up view path cruft and split path implementations into Template::Path ↵ | Joshua Peek | 2008-12-29 | 1 | -1/+0 |
| | | | | and Template::EagerPath | ||||
* | Ensure the template format is always passed to the template finder. Now we ↵ | Joshua Peek | 2008-12-21 | 2 | -4/+9 |
| | | | | can cleanup some nasty stuff. | ||||
* | Merge docrails | Pratik Naik | 2008-12-19 | 1 | -0/+1 |
| | |||||
* | normalize author names in changelogs [#1495 state:committed] | Xavier Noria | 2008-12-16 | 1 | -8/+8 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Fix tests broken by switch to Pathname | Jeremy Kemper | 2008-12-09 | 1 | -3/+3 |
| | |||||
* | Register bogus template handlers for ActionMailer test fixtures | Joshua Peek | 2008-12-03 | 2 | -0/+10 |
| | |||||
* | Removed deprecated register_template_extension | Joshua Peek | 2008-12-02 | 1 | -6/+0 |
| | |||||
* | Ensure ActionMailer doesn't blow up when a two argument proc is set for the ↵ | Tekin Suleyman | 2008-12-01 | 2 | -0/+55 |
| | | | | | | | asset host Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1394 state:committed] | ||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-11-25 | 1 | -0/+2 |
|\ | |||||
| * | Ensure ActionView will be available to ActionMailer if ActionController is ↵ | Joshua Peek | 2008-11-25 | 1 | -0/+2 |
| | | | | | | | | not loaded | ||||
* | | Explicitly require Action View also | Jeremy Kemper | 2008-11-24 | 1 | -0/+2 |
|/ | |||||
* | Add config.preload_frameworks to load all frameworks at startup. Default to ↵ | Jeremy Kemper | 2008-11-24 | 1 | -2/+0 |
| | | | | false so Rails autoloads itself as it's used. | ||||
* | Add LAZY env flag for testing autoload/lazy load feature | Joshua Peek | 2008-11-24 | 1 | -2/+1 |
| | |||||
* | Remove explicit tmail requires in favor of autoload | Jeremy Kemper | 2008-11-23 | 2 | -3/+0 |
| | |||||
* | use autoload instead of explicit requires for ActionMailer | Joshua Peek | 2008-11-23 | 10 | -47/+63 |
| | |||||
* | ActionMailer should respect content type when choosing layouts | Colin Curtin | 2008-11-21 | 5 | -2/+33 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fixed RFC-2045 quoted-printable bug [#1421 state:committed] | Alexey Mahotkin | 2008-11-20 | 3 | -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 now | David Heinemeier Hansson | 2008-11-19 | 3 | -4/+4 |
| | |||||
* | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-15 | 6 | -11/+37 |
|\ | |||||
| * | Added lambda merging to OptionMerger (especially useful with named_scope and ↵ | David Heinemeier Hansson | 2008-11-15 | 3 | -1/+12 |
| | | | | | | | | with_options) [#740 state:commited] (Paweł Kondzior) | ||||
| * | A few more dependency updates | David Heinemeier Hansson | 2008-11-14 | 1 | -1/+1 |
| | | |||||
| * | Prepare for RC2 | David Heinemeier Hansson | 2008-11-14 | 2 | -2/+2 |
| | | |||||
| * | Fixed method_missing for ActionMailer so it no longer matches methods where ↵ | Joel Chippindale | 2008-11-11 | 2 | -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 Chippindale | 2008-11-11 | 2 | -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 also | Jeremy Kemper | 2008-11-08 | 1 | -3/+3 |
|/ | |||||
* | Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and ↵ | Grant Hollingworth | 2008-11-06 | 4 | -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 today | David Heinemeier Hansson | 2008-10-24 | 1 | -1/+1 |
| | |||||
* | Proper update call for gem server | David Heinemeier Hansson | 2008-10-23 | 1 | -1/+1 |
| |