aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Expand)AuthorAgeFilesLines
* 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-153-1/+9
* [ci skip] correct doc for `register_preview_interceptor`yuuji.yaginuma2014-06-151-1/+1
* Merge pull request #15590 from zuhao/refactor_actionview_register_template_ha...Yves Senn2014-06-121-4/+0
|\
| * Add unregister_template_handler to prevent leaks.Zuhao Wan2014-06-121-4/+0
* | [ci skip] Improve enable_starttls_auto documentation.Juanito Fatas2014-06-111-2/+2
|/
* Restore I18n.locale to default after test.Zuhao Wan2014-06-071-0/+4
* Restore test deliveries properly in ActionMailer.Zuhao Wan2014-06-071-0/+8
* Relax mail gem constraint from ~> 2.5.4 to ~> 2.5, >= 2.5.4Benjamin Fleischer2014-06-031-1/+1
* Feature requests should be made on the mailing list, not submitted toZachary Scott2014-06-011-1/+5
* 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
* Merge pull request #15083 from zuhao/refactor_actionmailer_i18n_with_controll...Yves Senn2014-05-131-11/+14
|\
| * Use with_translation helper to clean up I18n stored translations.Zuhao Wan2014-05-131-11/+14
* | Merge pull request #15082 from zuhao/refactor_actionmailer_delivery_methods_testYves Senn2014-05-131-30/+42
|\ \
| * | Move state restoration from setup/teardown into affected test cases.Zuhao Wan2014-05-131-30/+42
| |/
* | Merge pull request #15086 from zuhao/refactor_actionmailer_mail_layout_testYves Senn2014-05-131-10/+0
|\ \
| * | Remove unnecessary setup and teardown.Zuhao Wan2014-05-131-10/+0
| |/
* / A minor stylistic fix and cleanup of mail deliveries.Zuhao Wan2014-05-131-3/+5
|/
* Fix state leaks in actionmailer/test/base_test.rb.Zuhao Wan2014-05-071-102/+157
* [ci skip] Improve formatting and ymlGaurav Sharma2014-04-241-2/+2
* Fix MailerPreview broken testsArthur Neves2014-03-151-4/+4
* Make sure we clean preview_interceptorsArthur Neves2014-03-071-0/+1
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-072-2/+2
|\
| * :scissors:Zachary Scott2014-02-232-2/+2
* | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-052-7/+19
* | Point master changelogs to 4-1-stable branchCarlos Antonio da Silva2014-02-251-61/+1
* | 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
* Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-181-1/+1
|\
| * Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-181-1/+1
* | Fix typo [ci skip]Rafael Mendonça França2014-02-161-1/+1
* | Merge pull request #13997 from dmitry/test_coverage_improvementRafael Mendonça França2014-02-092-10/+21
|\ \
| * | add actionmailer test coverage for undefined delivery methodDmitry Polushkin2014-02-092-10/+21
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-091-1/+1
|\ \ \ | |/ / |/| |
| * | e-mail => email, and subject/verb agreementWaynn Lue2014-01-131-1/+1
* | | tidy CHANGELOGs [ci skip]Yves Senn2014-01-301-4/+6
* | | Remove an extra comment [ci skip]Robin Dupret2014-01-261-1/+0
* | | Support underscored symbols in Action Mailer configAndrew White2014-01-263-5/+37
* | | Don't use a class_attribute for ActionMailer::Base.preview_pathAndrew White2014-01-262-7/+3
* | | Add the ability to intercept emails before previewingAndrew White2014-01-264-5/+109
* | | docs should say `email` not `Email`. [ci skip]Yves Senn2014-01-201-1/+1
* | | removed extra comma [ci skip]Kuldeep Aggarwal2014-01-141-1/+1
* | | standardize on jruby_skip & rbx_skipGaurish Sharma2014-01-131-0/+9
* | | quick formatting pass through CHANGELOGS. [ci skip].Yves Senn2014-01-061-0/+2
* | | Add preview_path to autoload_paths in after_initializeAndrew White2014-01-042-6/+14