| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Document inline image mailer preview interceptor | Andrew White | 2015-05-04 | 3 | -49/+63 |
| | | | | | Explain what the interceptor is used for and how to remove it. | ||||
| * | Add support for inline images to mailer previews | Andrew White | 2015-05-04 | 2 | -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 Mueller | 2015-04-30 | 1 | -0/+5 |
| | | | | | a subdirectory, closes #19092. | ||||
| * | Make ActionMailer #cache helper a no-op, not an exception | Javan Makhmali | 2015-04-28 | 1 | -1/+13 |
| | | |||||
| * | mailer previews for `NullMail` instances. Closes #19849. | Yves Senn | 2015-04-28 | 2 | -0/+8 |
| | | |||||
| * | mailer previews, make sure labels and values line up. | Yves Senn | 2015-04-28 | 1 | -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 Pipinellis | 2015-04-28 | 1 | -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-2 | Guillermo Iguaran | 2015-04-13 | 1 | -1/+1 |
| |\ | | | | | Upgrade to Ruby 2.2.2 | ||||
| | * | Upgrade to Ruby 2.2.2 | Jon Atack | 2015-04-14 | 1 | -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 Scott | 2015-04-12 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'action-mailer-async-doc-fixes' of ↵ | Zachary Scott | 2015-04-12 | 1 | -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 Fazkeas | 2014-12-18 | 1 | -8/+11 |
| | | | |||||
| * | | [skip ci] Fix typo in actionmailer documentation | Anton Davydov | 2015-03-15 | 1 | -1/+1 |
| | | | |||||
| * | | Target Ruby 2.2.1 in gemspecs | Peter Suschlik | 2015-03-09 | 1 | -1/+1 |
| | | | | | | | | | This is a follow-up to #19257 | ||||
| * | | Revert "Leave all our tests as order_dependent! for now" | Matthew Draper | 2015-03-06 | 1 | -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-format | Robin Dupret | 2015-03-02 | 1 | -1/+11 |
| |\ \ | | | | | | | [ci skip] Add code example for MailHelper#block_format documentation | ||||
| | * | | [ci skip] Add code example for MailHelper#block_format documentation | Anton Davydov | 2015-03-02 | 1 | -1/+11 |
| | | | | |||||
| * | | | Removing unused mailer templates | Thiago Pradi | 2015-03-01 | 18 | -50/+0 |
| |/ / | |||||
| * | | update docs to reflect that mailer generator add suffix to generated classes ↵ | yuuji.yaginuma | 2015-02-25 | 1 | -15/+15 |
| | | | | | | | | | [ci skip] | ||||
| * | | Merge pull request #18393 from y-yagi/fix_mailer | Rafael Mendonça França | 2015-02-18 | 1 | -2/+2 |
| |\ \ | | | | | | | follow up to #18074 | ||||
| | * | | follow up to #18074 | yuuji.yaginuma | 2015-01-08 | 1 | -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 Davydov | 2015-02-15 | 1 | -0/+2 |
| | | | | |||||
| * | | | remove noise from AM tests | Aditya Kapoor | 2015-02-07 | 1 | -5/+16 |
| | | | | |||||
| * | | | Removed magic comments # encoding: utf-8 , since its default from ruby 2.0 ↵ | Vipul A M | 2015-02-03 | 3 | -3/+0 |
| | | | | | | | | | | | | | onwards. | ||||
| * | | | Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846 | robertomiranda | 2015-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | ref: https://github.com/rails/rails/pull/18763#issuecomment-72349769 | ||||
| * | | | unify CHANGELOG format. [ci skip] | Yves Senn | 2015-01-31 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #18521 from andrewvida/master | Rafael Mendonça França | 2015-01-14 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Correct the views that the mail method sends in API docs. | ||||
| | * | | | Correct views mail method sends in API docs | Andrew Vida | 2015-01-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix assertion that was never run | claudiob | 2015-01-11 | 1 | -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 path | Carlos Souza | 2015-01-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | For mailers created via generators Follow up to #18074 | ||||
| * | | | | Add assert_enqueued_emails and assert_no_enqueued_emails | George Claghorn | 2015-01-08 | 3 | -0/+115 |
| | |/ / |/| | | |||||
| * | | | Move changelog entry to the top [ci skip] | Carlos Antonio da Silva | 2015-01-07 | 1 | -7/+5 |
| | | | | |||||
| * | | | Add mailer suffix to generated files and classes | Carlos Souza | 2015-01-06 | 4 | -4/+17 |
| | | | | | | | | | | | | | | | | Following the same naming convention used in controllers and jobs. | ||||
| * | | | Remove unneeded requires | Rafael Mendonça França | 2015-01-04 | 1 | -1/+0 |
| | | | | | | | | | | | | | These requires were added only to change deprecation message | ||||
| * | | | Remove deprecate `*_path` helpers in email views | Rafael Mendonça França | 2015-01-04 | 1 | -0/+4 |
| | | | | |||||
| * | | | Remove deprecated ActionMailer deliver & deliver! | claudiob | 2015-01-04 | 3 | -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-year | Robin Dupret | 2015-01-01 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | Update copyright notices to 2015 [ci skip] | ||||
| | * | | | Update copyright notices to 2015 [ci skip] | Arun Agrawal | 2014-12-31 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Changelog edits [ci skip] | Robin Dupret | 2014-12-31 | 1 | -14/+14 |
| |/ / / | |||||
| * | | | Template lookup now respect default locale and I18n fallbacks. | Rafael Mendonça França | 2014-12-29 | 5 | -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.0 | claudiob | 2014-12-26 | 1 | -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_typo | Yves Senn | 2014-12-23 | 1 | -2/+2 |
| |\ \ \ | |_|/ |/| | | | | | fix typo in nodoc [ci skip] | ||||
| | * | | fix typo in nodoc | yuuji.yaginuma | 2014-12-23 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #17896 from GBH/globbing_route_mailer_preview | Rafael Mendonça França | 2014-12-08 | 1 | -1/+1 |
| |\ \ | | | | | | | fixing mailer previews for apps with globbing route | ||||
| | * | | fixing mailer previews for apps with globbing route | Oleg | 2014-12-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #17797 from y-yagi/donot_delete_mailer_layouts | Rafael Mendonça França | 2014-12-04 | 1 | -1/+3 |
| |\ \ \ | |/ / |/| | | Don't remove mailer layouts files | ||||
| | * | | Don't remove mailer layouts files | yuuji.yaginuma | 2014-11-27 | 1 | -1/+3 |
| | | | | |||||
| * | | | Fix documentation for #default | Sven Pachnit | 2014-12-01 | 1 | -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_for | yuuji.yaginuma | 2014-11-30 | 1 | -5/+0 |
| | | | | |||||
| * | | | Pass symbol as an argument instead of a block | Erik Michaels-Ober | 2014-11-29 | 1 | -2/+2 |
| | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/actionmailer