Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Backport #8450, the return value from mailer methods is not relevant. | Yves Senn | 2012-12-10 | 1 | -4/+3 |
| | | | | | | | Conflicts: actionmailer/CHANGELOG.md actionmailer/lib/action_mailer/base.rb | ||||
* | revised the actionmailer's CHANGELOG structure | Yves Senn | 2012-12-10 | 1 | -7/+8 |
| | |||||
* | Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call | Rafael Mendonça França | 2012-10-28 | 1 | -1/+13 |
| | | | | | | Do not render views when mail() isn't called. (NullMail refactoring) Conflicts: actionmailer/CHANGELOG.md | ||||
* | Merge pull request #6018 from lest/patch-1 | Carlos Antonio da Silva | 2012-05-14 | 1 | -1/+2 |
| | | | | mailer can be anonymous | ||||
* | Correct ActionMailer subject i18n lookup scope. | Andrew France | 2011-10-20 | 1 | -1/+1 |
| | | | The :actionmailer i18n scope part is not used and according to https://github.com/rails/rails/pull/2542 the implementation is correct. | ||||
* | update ActionMailer example using last truncate helper method signature | Alexey Vakhov | 2011-09-26 | 1 | -2/+2 |
| | |||||
* | grammar (missing "a") and formatting | Matt Jankowski | 2011-06-21 | 1 | -3/+3 |
| | |||||
* | clarify why the only_path => false option is needed when default :host has ↵ | Matt Jankowski | 2011-06-21 | 1 | -4/+4 |
| | | | | been set for mailers | ||||
* | elaborate details on why to use _url instead of _path in mailers | Matt Jankowski | 2011-06-21 | 1 | -2/+3 |
| | |||||
* | typo changes | JudeArasu | 2011-06-19 | 1 | -2/+3 |
| | |||||
* | The name for the plain text template in Rails3 appears to be ↵ | Jason Fox | 2011-06-15 | 1 | -4/+4 |
| | | | | method.text.erb, not, method.text.plain.erb. Updated the doc to reflect this change. Also fixed a reference to an example that was incorrect. | ||||
* | fix typo | Vijay Dev | 2011-06-08 | 1 | -1/+1 |
| | |||||
* | Add action_mailer observer and interceptors configuration options | Paco Guzman | 2011-06-07 | 1 | -4/+4 |
| | |||||
* | minor typo in the rdoc about Interceptor. | Teng Siong Ong | 2011-05-28 | 1 | -1/+1 |
| | |||||
* | minor spacing fix in code example in ActionMailer::Base. | Teng Siong Ong | 2011-05-28 | 1 | -8/+8 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 1 | -6/+6 |
|\ | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | ||||
| * | Remove extra white spaces on ActionMailer docs. | Sebastian Martinez | 2011-05-23 | 1 | -7/+7 |
| | | |||||
* | | Removed deprecated ActionMailer API and related tests | Josh Kalderimis | 2011-05-24 | 1 | -21/+3 |
|/ | |||||
* | More updates to ivars list. | José Valim | 2011-05-06 | 1 | -0/+2 |
| | |||||
* | Move variables to underscore format, update protected instance variables list. | José Valim | 2011-05-06 | 1 | -3/+0 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-19 | 1 | -0/+7 |
|\ | | | | | | | | | | | Conflicts: railties/guides/source/ajax_on_rails.textile railties/guides/source/generators.textile | ||||
| * | brings a #:nodoc: back | Xavier Noria | 2011-04-19 | 1 | -1/+1 |
| | | |||||
| * | Undocumented :openssl_verify_mode option for smtp_settings | Florent Piteau | 2011-04-19 | 1 | -0/+4 |
| | | |||||
| * | docs for ActionMailer::Base.default_i18n_subject | Sebastian Martinez | 2011-04-18 | 1 | -1/+4 |
| | | |||||
* | | Fix missing requires in Action Mailer | Prem Sichanugrist | 2011-04-13 | 1 | -0/+1 |
|/ | | | | | | This made the isolated test failed on CI server. Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | AM register_interceptor and register_observer only constantize if the ↵ | Josh Kalderimis | 2011-04-06 | 1 | -2/+2 |
| | | | | argument is a String | ||||
* | remove AM delegating register_observer and register_interceptor to Mail and ↵ | Josh Kalderimis | 2011-04-04 | 1 | -3/+27 |
| | | | | | | instead implement smarter versions allowing for string class names, also added proper Railtie support with tests. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Correct spelling for Base64 in action_mailer | Dalibor Nasevic | 2011-03-05 | 1 | -1/+1 |
| | |||||
* | fix typo | Vijay Dev | 2011-02-17 | 1 | -1/+1 |
| | |||||
* | Should use standard ruby signature for respond_to | Mikel Lindsaar | 2011-01-18 | 1 | -1/+1 |
| | |||||
* | Fixing spelling | Mikel Lindsaar | 2011-01-18 | 1 | -2/+2 |
| | |||||
* | A bunch of cleanup on the inherited template patch | wycats | 2010-12-26 | 1 | -9/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/peterb/docrails into peterb-master | Aditya Sanghi | 2010-11-29 | 1 | -1/+3 |
|\ | |||||
| * | Explain actionamailer authentication types | Peter Baker | 2010-10-14 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Ryan Bigg | 2010-11-26 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | * 'master' of github.com:lifo/docrails: Fix missing word in ActionMailer::Base documentation. | ||||
| * | | Fix missing word in ActionMailer::Base documentation. | Cheah Chu Yeow | 2010-11-25 | 1 | -2/+2 |
| |/ | |||||
* / | Update ActionMailer documentation to not use deprecated template_root method ↵ | Ryan Bigg | 2010-11-26 | 1 | -1/+1 |
|/ | | | | as documentation, but rather raise_delivery_errors method | ||||
* | self is implied, so remove self | Aaron Patterson | 2010-09-29 | 1 | -1/+1 |
| | |||||
* | dry up method missing | Aaron Patterson | 2010-09-29 | 1 | -5/+2 |
| | |||||
* | We don't need to clear action_methods on inherited hook as they are cleaned ↵ | Piotr Sarnacki | 2010-09-03 | 1 | -5/+0 |
| | | | | on method_added hook | ||||
* | ActionMailer should not depend on ActionDispatch | Piotr Sarnacki | 2010-09-03 | 1 | -2/+1 |
| | |||||
* | Refactor ActionMailer to not use hide_actions | Piotr Sarnacki | 2010-09-03 | 1 | -8/+3 |
| | |||||
* | Include routes helpers only for inherited classes in ActionMailer | Piotr Sarnacki | 2010-09-03 | 1 | -21/+9 |
| | |||||
* | Deprecate the old mailer API that was not deprecated yet. | José Valim | 2010-08-29 | 1 | -1/+7 |
| | |||||
* | Remove the deprecated API from ActionMailer. | José Valim | 2010-08-29 | 1 | -1/+0 |
| | |||||
* | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 1 | -11/+11 |
| | | | | 's/[ \t]*$//' -i {} \;) | ||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-07-30 | 1 | -2/+2 |
|\ | |||||
| * | edit pass to apply API guideline wrt the use of "# =>" in example code | Xavier Noria | 2010-07-30 | 1 | -2/+2 |
| | | |||||
* | | itsy bitsy changes to ActionMailer documentation | Neeraj Singh | 2010-07-28 | 1 | -14/+11 |
|/ | |||||
* | Mention that ActionMailer::Base.default_url_options is now deprecated | Jeroen van Dijk | 2010-07-22 | 1 | -5/+4 |
| |