aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | 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-081-0/+51
| |
* | Add mailer suffix to generated files and classesCarlos Souza2015-01-063-4/+10
| | | | | | | | | | 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 deprecated ActionMailer deliver & deliver!claudiob2015-01-041-20/+0
| | | | | | | | | | These methods were deprecated in Rails 4.2 (see f4ee1147) so they can be safely removed in Rails 5.0.
* | Update copyright notices to 2015 [ci skip]Arun Agrawal2014-12-311-1/+1
| |
* | Template lookup now respect default locale and I18n fallbacks.Rafael Mendonça França2014-12-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | 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
| | |
* | | Start Rails 5 development :tada:Rafael Mendonça França2014-11-281-3/+3
|/ / | | | | | | | | | | | | We will support only Ruby >= 2.1. But right now we don't accept pull requests with syntax changes to drop support to Ruby 1.9.
* | Update docs to reflect changes to MailerGenerator.Guo Xiang Tan2014-11-251-11/+17
| |
* | Removing unnecessary File.join callsAndy Jeffries2014-11-241-1/+1
| |
* | Creates an ApplicationMailer and layout by default, including html and body ↵Andy Jeffries2014-11-213-2/+6
| | | | | | | | tags to reduce spam score
* | Prepare for 4.2.0.beta4 releaseGodfrey Chan2014-10-301-1/+1
| |
* | edit pass over all warningsXavier Noria2014-10-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uniformizes warning messages. I used the most common style already present in the code base: * Capitalize the first word. * End the message with a full stop. * "Rails 5" instead of "Rails 5.0". * Backticks for method names and inline code. Also, converted a few long strings into the new heredoc convention.
* | let's warn with heredocsXavier Noria2014-10-281-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | The current style for warning messages without newlines uses concatenation of string literals with manual trailing spaces where needed. Heredocs have better readability, and with `squish` we can still produce a single line. This is a similar use case to the one that motivated defining `strip_heredoc`, heredocs are super clean.
* | Making the actionmailer docs more explicit to understand [ci skip]Rishi Jain2014-10-262-3/+6
| |
* | [ci skip] add :queue option to deliver_later and deliver_later! documentationyuuji.yaginuma2014-10-191-0/+2
| |
* | [ci skip] Fix word wrap, capitalization, and spacing of text from #17284Zachary Scott2014-10-181-4/+5
| |
* | [ci skip] Add a note about headers overwritingNicolas Cavigneaux2014-10-181-5/+21
| | | | | | | | | | | | | | | | | | Since some headers can appear multiple times in an email it's required to set it to nil first when you want to overwrite an existing one. This commit add some information about this process. Fix #15912
* | Only include the needed assertionsRafael Mendonça França2014-10-071-1/+2
| |
* | fix tests on action_mailerschneems2014-10-071-1/+1
| | | | | | Include appropriate helpers and use `assert_dom_equal` where applicable
* | 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
| | | | | | | | | | | | | | | | | | When we are loading a component and we want to know its version, we are actually not speaking about the constant but the library itself. [ci skip] [Godfrey Chan & Xavier Noria]
* | 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 railtie
| | * | [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 ↵Lucas Mazza2014-08-191-0/+9
| | | | | | | | | | | | | | | | `ActionMailer::TestCase`. This way these methods are available outside the ActionMailer test suite, but they are still duplicated inside `test/abstract_unit` for test cases that don't inherit from the `ActionMailer::TestCase` class.
* | Merge branch 'master' into loofahRafael Mendonça França2014-08-175-2/+66
|\ \ | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md
| * | [ActionMailer] Rename ActionMailer::DelayedDeliveryJob to ↵Abdelkader Boudih2014-08-173-4/+6
| | | | | | | | | | | | ActionMailer::DeliveryJob
| * | Fixed indentationCristian Bica2014-08-161-1/+1
| | |