aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
Commit message (Expand)AuthorAgeFilesLines
* Preparing for 4.2.0.beta2 releaseRafael Mendonça França2014-09-261-1/+1
* Allow attaching files while the mail view is renderedChristian Felder (masone)2014-09-222-2/+3
* Rename remaining :in / :at to :wait / :wait_untilCristian Bica2014-09-041-12/+9
* Active Job refactoringCristian Bica2014-09-031-9/+4
* [ci skip] Fix a typo in the doc of MessageDeliveryyuuji.yaginuma2014-09-021-3/+3
* Refer to the library name instead of the constantRobin Dupret2014-08-301-1/+1
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-295-30/+109
|\
| * Merge pull request #16598 from seuros/masterMatthew Draper2014-08-231-0/+1
| |\
| | * [ActionMailer] require activejob railtieAbdelkader Boudih2014-08-221-0/+1
| * | applies API guidelines to new AM docsXavier Noria2014-08-212-32/+32
| |/
| * [Rdoc] Make clear that we are sending an AR object [ci skip]Abdelkader Boudih2014-08-202-16/+16
| * Fix typo in rdoc [ci skip]Abdelkader Boudih2014-08-202-16/+16
| * Updated rdoc / guides / release notes related to ActiveJob / ActionMailerCristian Bica2014-08-204-34/+92
| * Deprecated .deliver / .deliver! to .deliver_now / .deliver_now!Cristian Bica2014-08-201-2/+22
* | Preparing for 4.2.0.beta1 releaseDavid Heinemeier Hansson2014-08-191-1/+1
|/
* Add `set_delivery_method` and `restore_delivery_method` to `ActionMailer::Tes...Lucas Mazza2014-08-191-0/+9
* Merge branch 'master' into loofahRafael Mendonça França2014-08-175-2/+66
|\
| * [ActionMailer] Rename ActionMailer::DelayedDeliveryJob to ActionMailer::Deliv...Abdelkader Boudih2014-08-173-4/+6
| * Fixed indentationCristian Bica2014-08-161-1/+1
| * Removed method missing from ActionMailer::MessageDeliveryCristian Bica2014-08-152-4/+4
| * Refactor DeliverLater into MessageDeliveryAbdelkader Boudih2014-08-147-73/+62
| * Make ActionMailer::Previews methods class methods.Abdelkader Boudih2014-08-141-0/+2
| * Added ActionMailer::DeliverLaterAbdelkader Boudih2014-08-135-1/+72
* | Merge branch 'master' into loofahRafael Mendonça França2014-08-123-14/+36
|\|
| * Deprecate `*_path` methods in mailers@schneems and @sgrif2014-07-302-1/+6
| * Raise an exception when attachments are added after `mail` was called.Yves Senn2014-07-291-1/+16
| * Prefer to pass block when logging.Guo Xiang Tan2014-07-181-11/+13
| * Fix typos like `a html` to `an html` and 'an mail' to 'an email'. [ci skip]Santosh Wadghule2014-07-141-1/+1
* | Include the selector assertions on the test caseRafael Mendonça França2014-07-151-0/+2
* | Merge pull request #11218 from kaspth/loofah-integrationRafael Mendonça França2014-07-101-3/+2
|\ \ | |/ |/|
| * Restore delivery method on teardowns.Timm2014-06-161-3/+2
* | Rename preview_enabled option to show_previewsRafael Mendonça França2014-07-012-7/+7
* | Add configuration to enable mail previewsLeonard Garvey2014-07-012-1/+21
* | Merge pull request #15815 from DNNX/mail-helper-refactoringRafael Mendonça França2014-06-191-2/+2
|\ \
| * | Remove unused block parameter from #gsub call in AM::MailHelper#block_formatViktar Basharymau2014-06-191-2/+2
* | | Add `logger.debug?` guard to `ActionMailer::LogSubscriber#process`Viktar Basharymau2014-06-191-0/+1
|/ /
* | allow preview interceptors to be registered through `config.action_mailer`.Yves Senn2014-06-152-1/+2
* | [ci skip] correct doc for `register_preview_interceptor`yuuji.yaginuma2014-06-151-1/+1
|/
* [ci skip] Improve enable_starttls_auto documentation.Juanito Fatas2014-06-111-2/+2
* Restore test deliveries properly in ActionMailer.Zuhao Wan2014-06-071-0/+8
* Pass through AM documentation re: 02d048d [ci skip]Zachary Scott2014-05-262-5/+7
* Use "Action Mailer" as canonical name in documentation [ci skip]Zachary Scott2014-05-261-1/+1
* Add description of ActionMailer::TestHelper module [ci skip]Zachary Scott2014-05-261-0/+2
* [ci skip] Improve formatting and ymlGaurav Sharma2014-04-241-2/+2
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-071-1/+1
|\
| * :scissors:Zachary Scott2014-02-231-1/+1
* | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-052-7/+19
* | update version to 4.2.0.alphaYves Senn2014-02-231-1/+1
|/
* Fix render plain docs example in AM::BaseGuillermo Iguaran2014-02-181-2/+2
* Update Docs in favor to use render plain instead of text optionrobertomiranda2014-02-181-3/+3