Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Bump required Ruby version to 2.1.0 | claudiob | 2014-11-28 | 1 | -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ça | 2014-11-28 | 2 | -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 e2cce6c | Jon Atack | 2014-11-27 | 1 | -2/+2 |
| | | | | | | [skip ci] | ||||
* | | Fix CHANGELOG typo introduced in e2cce6cd [ci skip] | Zachary Scott | 2014-11-27 | 1 | -1/+1 |
| | | |||||
* | | Action Mailer change log pass | Jon Atack | 2014-11-27 | 1 | -22/+21 |
|/ | | | [skip ci] | ||||
* | Use released rails-dom-testing | Rafael Mendonça França | 2014-11-25 | 1 | -1/+1 |
| | |||||
* | let the AM test suite pass in 1.9 | Xavier Noria | 2014-11-24 | 1 | -2/+2 |
| | |||||
* | Update docs to reflect changes to MailerGenerator. | Guo Xiang Tan | 2014-11-25 | 1 | -11/+17 |
| | |||||
* | Add missing CHANGELOG entry. | Guo Xiang Tan | 2014-11-25 | 1 | -0/+7 |
| | |||||
* | Merge pull request #17646 from andyjeffries/html_layout_fix | David Heinemeier Hansson | 2014-11-25 | 3 | -2/+6 |
|\ | | | | | Creating mailer layouts by default, including html and body tags | ||||
| * | Removing unnecessary File.join calls | Andy Jeffries | 2014-11-24 | 1 | -1/+1 |
| | | |||||
| * | Creates an ApplicationMailer and layout by default, including html and body ↵ | Andy Jeffries | 2014-11-21 | 3 | -2/+6 |
| | | | | | | | | tags to reduce spam score | ||||
* | | let mailer templates generate URLs by default [Xavier Noria, Richard Schneeman] | Xavier Noria | 2014-11-24 | 3 | -0/+68 |
|/ | |||||
* | Tiny documentation styling fixes [ci skip] | Robin Dupret | 2014-11-02 | 1 | -16/+21 |
| | |||||
* | - Changed redundant user of `deliver` to `deliver_now` | Vipul A M | 2014-11-01 | 1 | -2/+7 |
| | | | | | - Wrapped text in setting defaults section. Also added break, to a sentence. [ci skip] | ||||
* | Prepare for 4.2.0.beta4 release | Godfrey Chan | 2014-10-30 | 1 | -1/+1 |
| | |||||
* | edit pass over all warnings | Xavier Noria | 2014-10-28 | 1 | -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 heredocs | Xavier Noria | 2014-10-28 | 1 | -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 Jain | 2014-10-26 | 2 | -3/+6 |
| | |||||
* | [ci skip] add :queue option to deliver_later and deliver_later! documentation | yuuji.yaginuma | 2014-10-19 | 1 | -0/+2 |
| | |||||
* | [ci skip] Fix word wrap, capitalization, and spacing of text from #17284 | Zachary Scott | 2014-10-18 | 1 | -4/+5 |
| | |||||
* | [ci skip] Add a note about headers overwriting | Nicolas Cavigneaux | 2014-10-18 | 1 | -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-testing | Rafael Mendonça França | 2014-10-16 | 1 | -1/+1 |
| | |||||
* | some changelog formatting. [ci skip] | Yves Senn | 2014-10-16 | 1 | -1/+1 |
| | |||||
* | Only include the needed assertions | Rafael Mendonça França | 2014-10-07 | 2 | -2/+3 |
| | |||||
* | fix tests on action_mailer | schneems | 2014-10-07 | 4 | -7/+9 |
| | | | Include appropriate helpers and use `assert_dom_equal` where applicable | ||||
* | Follow up to #16613 | Robin Dupret | 2014-09-28 | 1 | -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 release | Rafael Mendonça França | 2014-09-26 | 1 | -1/+1 |
| | |||||
* | Use released rails-dom-testing | Rafael Mendonça França | 2014-09-25 | 1 | -1/+1 |
| | |||||
* | Merge pull request #16974 from silp-com/mail_was_called | Yves Senn | 2014-09-22 | 5 | -2/+30 |
|\ | | | | | | | ActionMailer: mark mail as called after instead of before processing it | ||||
| * | Allow attaching files while the mail view is rendered | Christian Felder (masone) | 2014-09-22 | 4 | -2/+24 |
|/ | |||||
* | [ci skip] ActionView and ActionMailer CHANGELOG docs fixes | Akshay Vishnoi | 2014-09-18 | 1 | -4/+4 |
| |