aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | Start Rails 5 development :tada:Rafael Mendonça França2014-11-282-66/+4
| | | | | | | | | | | | | | 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.
* | Follow-up to e2cce6cJon Atack2014-11-271-2/+2
| | | | | | [skip ci]
* | Fix CHANGELOG typo introduced in e2cce6cd [ci skip]Zachary Scott2014-11-271-1/+1
| |
* | Action Mailer change log passJon Atack2014-11-271-22/+21
|/ | | [skip ci]
* Use released rails-dom-testingRafael Mendonça França2014-11-251-1/+1
|
* let the AM test suite pass in 1.9Xavier Noria2014-11-241-2/+2
|
* Update docs to reflect changes to MailerGenerator.Guo Xiang Tan2014-11-251-11/+17
|
* Add missing CHANGELOG entry.Guo Xiang Tan2014-11-251-0/+7
|
* Merge pull request #17646 from andyjeffries/html_layout_fixDavid Heinemeier Hansson2014-11-253-2/+6
|\ | | | | Creating mailer layouts by default, including html and body tags
| * 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
* | let mailer templates generate URLs by default [Xavier Noria, Richard Schneeman]Xavier Noria2014-11-243-0/+68
|/
* Tiny documentation styling fixes [ci skip]Robin Dupret2014-11-021-16/+21
|
* - Changed redundant user of `deliver` to `deliver_now`Vipul A M2014-11-011-2/+7
| | | | | - Wrapped text in setting defaults section. Also added break, to a sentence. [ci skip]
* 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
* Use released rails-dom-testingRafael Mendonça França2014-10-161-1/+1
|
* some changelog formatting. [ci skip]Yves Senn2014-10-161-1/+1
|
* Only include the needed assertionsRafael Mendonça França2014-10-072-2/+3
|
* fix tests on action_mailerschneems2014-10-074-7/+9
| | | Include appropriate helpers and use `assert_dom_equal` where applicable
* Follow up to #16613Robin Dupret2014-09-281-0/+1
| | | | | | | | | | | | Since we want this flag to be enabled anytime we are running the tests under JRuby, let's enable this at the Rakefile level so people get the performance boost on their local checkout. Moreover, we avoid having to update this particular line anytime the option changes on the JRuby side. The only drawback is that we have to define it in every Rakefile but there's no big deal, this is already the case for other options.
* Preparing for 4.2.0.beta2 releaseRafael Mendonça França2014-09-261-1/+1
|
* Use released rails-dom-testingRafael Mendonça França2014-09-251-1/+1
|
* Merge pull request #16974 from silp-com/mail_was_calledYves Senn2014-09-225-2/+30
|\ | | | | | | ActionMailer: mark mail as called after instead of before processing it
| * Allow attaching files while the mail view is renderedChristian Felder (masone)2014-09-224-2/+24
|/
* [ci skip] ActionView and ActionMailer CHANGELOG docs fixesAkshay Vishnoi2014-09-181-4/+4
|
* Default to sorting user's test cases for nowGodfrey Chan2014-09-081-1/+1
| | | | | | | | | | | Goals: 1. Default to :random for newly generated applications 2. Default to :sorted for existing applications with a warning 3. Only show the warning once 4. Only show the warning if the app actually uses AS::TestCase Fixes #16769
* Rename remaining :in / :at to :wait / :wait_untilCristian Bica2014-09-042-15/+14
|
* Active Job refactoringCristian Bica2014-09-032-21/+16
|
* Leave all our tests as order_dependent! for nowMatthew Draper2014-09-021-0/+5
| | | | | | | | | We're seeing too many failures to believe otherwise. This reverts commits bc116a55ca3dd9f63a1f1ca7ade3623885adcc57, cbde413df3839e06dd14e3c220e9800af91e83ab, bf0a67931dd8e58f6f878b9510ae818ae1f29a3a, and 2440933fe2c27b27bcafcd9019717800db2641aa.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 01:03:06 +0000