aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into loofahRafael Mendonça França2014-08-126-14/+95
|\
| * Nobody sucks so nobody should call this awful method nameRafael Mendonça França2014-08-121-1/+1
| * users_dont_suck_but_only_we_suck_and_only_our_tests_are_order_dependent!Akira Matsuda2014-08-121-0/+5
| * Deprecate `*_path` methods in mailers@schneems and @sgrif2014-07-303-1/+12
| * Raise an exception when attachments are added after `mail` was called.Yves Senn2014-07-293-1/+62
| * Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-191-0/+2
| |\
| | * Stop requiring mocha automaticallyRafael Mendonça França2014-07-191-0/+2
| * | 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
| |/
* | Defining the right dependenciesRafael Mendonça França2014-07-151-0/+1
* | Include the selector assertions on the test caseRafael Mendonça França2014-07-152-3/+2
* | Rails is a module not a classRafael Mendonça França2014-07-151-1/+1
* | Merge pull request #11218 from kaspth/loofah-integrationRafael Mendonça França2014-07-102-3/+52
|\ \ | |/ |/|
| * Restore delivery method on teardowns.Timm2014-06-161-3/+2
| * Inline Assertion reference.Timm2014-06-161-3/+4
| * Remove response faking.Timm2014-06-161-15/+1
| * Use 1.9 syntax.Timm2014-06-161-6/+6
| * Added rails-dom-testing and rails-html-sanitizer to Gemfile. Added tests for ...Timm2014-06-161-0/+63
* | test i18n against a routed appAaron Patterson2014-07-071-1/+16
* | add test coverage for the action mailerDmitry Polushkin2014-07-046-38/+16
* | Rename preview_enabled option to show_previewsRafael Mendonça França2014-07-013-8/+8
* | Add configuration to enable mail previewsLeonard Garvey2014-07-013-1/+30
* | 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