aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Add support for inline images to mailer previewsAndrew White2015-05-042-1/+54
| | | | | | | | | | | | | | | Use a preview interceptor to search for inline cid: urls in src attributes and convert them to data urls.
* | | Mailer preview now uses `url_for` to fix links to emails for apps running on ↵Remo Mueller2015-04-301-0/+5
| | | | | | | | | | | | a subdirectory, closes #19092.
* | | Make ActionMailer #cache helper a no-op, not an exceptionJavan Makhmali2015-04-281-1/+13
| | |
* | | mailer previews for `NullMail` instances. Closes #19849.Yves Senn2015-04-282-0/+8
| | |
* | | mailer previews, make sure labels and values line up.Yves Senn2015-04-281-0/+4
| | | | | | | | | | | | | | | | | | While this was true before when every `dd` had a value, this patch makes sure that everything keeps lining up even when the `dd` node is blank.
* | | AUTH PLAIN is Base64 encoded [ci skip]Achilleas Pipinellis2015-04-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contrary to what the name suggests, PLAIN SMTP authentication is not sent in plain text but is Base64 encoded like the LOGIN method. Their difference is described in the third link below. * https://tools.ietf.org/html/rfc4954 * https://en.wikipedia.org/wiki/SMTP_Authentication * http://www.samlogic.net/articles/smtp-commands-reference-auth.htm
* | | Merge pull request #19753 from jonatack/use-ruby-2-2-2Guillermo Iguaran2015-04-131-1/+1
|\ \ \ | | | | | | | | Upgrade to Ruby 2.2.2
| * | | Upgrade to Ruby 2.2.2Jon Atack2015-04-141-1/+1
| | | | | | | | | | | | | | | | and fix the grammar in the ruby_version_check.rb user message.
* | | | Since the delegator wasn't identified earlier, we should here [ci skip]Zachary Scott2015-04-121-2/+2
| | | |
* | | | Merge branch 'action-mailer-async-doc-fixes' of ↵Zachary Scott2015-04-121-8/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | https://github.com/mfazekas/rails into mfazekas-action-mailer-async-doc-fixes Conflicts: actionmailer/lib/action_mailer/base.rb
| * | | Fixes to inaccurate documentation in action_mailer [ci skip]Miklos Fazkeas2014-12-181-8/+11
| | | |
* | | | [skip ci] Fix typo in actionmailer documentationAnton Davydov2015-03-151-1/+1
| | | |
* | | | Target Ruby 2.2.1 in gemspecsPeter Suschlik2015-03-091-1/+1
| | | | | | | | | | | | | | | | This is a follow-up to #19257
* | | | Revert "Leave all our tests as order_dependent! for now"Matthew Draper2015-03-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2f52f969885b2834198de0045748436a4651a94e. Conflicts: actionmailer/test/abstract_unit.rb actionview/test/abstract_unit.rb activemodel/test/cases/helper.rb activerecord/test/cases/helper.rb activesupport/test/abstract_unit.rb railties/test/abstract_unit.rb
* | | | Merge pull request #19133 from davydovanton/update-doc-example-mail-block-formatRobin Dupret2015-03-021-1/+11
|\ \ \ \ | | | | | | | | | | [ci skip] Add code example for MailHelper#block_format documentation
| * | | | [ci skip] Add code example for MailHelper#block_format documentationAnton Davydov2015-03-021-1/+11
| | | | |
* | | | | Removing unused mailer templatesThiago Pradi2015-03-0118-50/+0
|/ / / /
* | | | update docs to reflect that mailer generator add suffix to generated classes ↵yuuji.yaginuma2015-02-251-15/+15
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #18393 from y-yagi/fix_mailerRafael Mendonça França2015-02-181-2/+2
|\ \ \ \ | | | | | | | | | | follow up to #18074
| * | | | follow up to #18074yuuji.yaginuma2015-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | * ignore mailer suffix when generate test files * add mailer suffix to view files
* | | | | Added default values for #format_paragraph docs [skip ci]Anton Davydov2015-02-151-0/+2
| | | | |
* | | | | remove noise from AM testsAditya Kapoor2015-02-071-5/+16
| | | | |
* | | | | Removed magic comments # encoding: utf-8 , since its default from ruby 2.0 ↵Vipul A M2015-02-033-3/+0
| | | | | | | | | | | | | | | | | | | | onwards.
* | | | | Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846robertomiranda2015-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | ref: https://github.com/rails/rails/pull/18763#issuecomment-72349769
* | | | | unify CHANGELOG format. [ci skip]Yves Senn2015-01-311-0/+2
| |_|/ / |/| | |
* | | | Merge pull request #18521 from andrewvida/masterRafael Mendonça França2015-01-141-1/+1
|\ \ \ \ | | | | | | | | | | Correct the views that the mail method sends in API docs.
| * | | | Correct views mail method sends in API docsAndrew Vida2015-01-141-1/+1
| | | | |
* | | | | Fix assertion that was never runclaudiob2015-01-111-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to run whether the `welcome` method of the ActionMailer::Base subclass raises an error, `message` must be called, otherwise the method is not executed at all. You could just replace with `def welcome; raise StandardError; end` and you would still see a passing test. This commit fixes the test so the assertion is actually executed, just like any other tests in the file, where `.message` is called.
* | | | Add _mailer suffix to i18n pathCarlos Souza2015-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | For mailers created via generators Follow up to #18074
* | | | Add assert_enqueued_emails and assert_no_enqueued_emailsGeorge Claghorn2015-01-083-0/+115
| |/ / |/| |
* | | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2015-01-071-7/+5
| | |
* | | Add mailer suffix to generated files and classesCarlos Souza2015-01-064-4/+17
| | | | | | | | | | | | | | | Following the same naming convention used in controllers and jobs.
* | | Remove unneeded requiresRafael Mendonça França2015-01-041-1/+0
| | | | | | | | | | | | These requires were added only to change deprecation message
* | | Remove deprecate `*_path` helpers in email viewsRafael Mendonça França2015-01-041-0/+4
| | |
* | | Remove deprecated ActionMailer deliver & deliver!claudiob2015-01-043-39/+4
| | | | | | | | | | | | | | | These methods were deprecated in Rails 4.2 (see f4ee1147) so they can be safely removed in Rails 5.0.
* | | Merge pull request #18271 from arunagw/change-copyright-yearRobin Dupret2015-01-012-2/+2
|\ \ \ | | | | | | | | Update copyright notices to 2015 [ci skip]
| * | | Update copyright notices to 2015 [ci skip]Arun Agrawal2014-12-312-2/+2
| | | |
* | | | Changelog edits [ci skip]Robin Dupret2014-12-311-14/+14
|/ / /
* | | Template lookup now respect default locale and I18n fallbacks.Rafael Mendonça França2014-12-295-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the following templates: mailer/demo.html.erb mailer/demo.en.html.erb mailer/demo.pt.html.erb Before this change for a locale that doesn't have its related file the `mailer/demo.html.erb` will be rendered even if `en` is the default locale. Now `mailer/demo.en.html.erb` has precedence over the file without locale. Also, it is possible to give a fallback. mailer/demo.pt.html.erb mailer/demo.pt-BR.html.erb So if the locale is `pt-PT`, `mailer/demo.pt.html.erb` will be rendered given the right I18n fallback configuration. Fixes #11884.
* | | Require Ruby 2.2 for Rails 5.0claudiob2014-12-261-1/+1
| | | | | | | | | | | | | | | Stems from [this comment](https://github.com/rails/rails/pull/18203#issuecomment-68138096) by @robin850 and by the blog post http://weblog.rubyonrails.org/2014/12/19/Rails-4-2-final
* | | Merge pull request #18163 from y-yagi/fix_nodoc_typoYves Senn2014-12-231-2/+2
|\ \ \ | |_|/ |/| | | | | fix typo in nodoc [ci skip]
| * | fix typo in nodocyuuji.yaginuma2014-12-231-1/+1
|/ /
* | Merge pull request #17896 from GBH/globbing_route_mailer_previewRafael Mendonça França2014-12-081-1/+1
|\ \ | | | | | | fixing mailer previews for apps with globbing route
| * | fixing mailer previews for apps with globbing routeOleg2014-12-031-1/+1
| | |
* | | Merge pull request #17797 from y-yagi/donot_delete_mailer_layoutsRafael Mendonça França2014-12-041-1/+3
|\ \ \ | |/ / |/| | Don't remove mailer layouts files
| * | Don't remove mailer layouts filesyuuji.yaginuma2014-11-271-1/+3
| | |
* | | Fix documentation for #defaultSven Pachnit2014-12-011-1/+1
| | | | | | | | | Just a little syntax error I spotted by accident. Cannot pass hash with curly braces without normal parentheses.
* | | [ci skip] fix description of url_foryuuji.yaginuma2014-11-301-5/+0
| | |
* | | Pass symbol as an argument instead of a blockErik Michaels-Ober2014-11-291-2/+2
| | |
* | | Bump required Ruby version to 2.1.0claudiob2014-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | [This article](http://weblog.rubyonrails.org/2014/8/20/Rails-4-2-beta1/#maintenance-consequences-and-rails-5-0) states that: > Rails 5.0 is in most likelihood going to target Ruby 2.2. Before the exact minimum version is fully decided, @arthurnn [suggests](https://github.com/rails/rails/pull/17830#issuecomment-64940383) that **at least** version 2.1.0 **must** be required by the `gemspec` files.