| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | 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 | |
| | |_|/ / |/| | | | ||||||
| * | | | | 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 | |
| | | | | | ||||||
| * | | | | 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 | 1 | -0/+51 | |
| | |/ / |/| | | ||||||
| * | | | Add mailer suffix to generated files and classes | Carlos Souza | 2015-01-06 | 3 | -4/+10 | |
| | | | | | | | | | | | | | | | | 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 deprecated ActionMailer deliver & deliver! | claudiob | 2015-01-04 | 1 | -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 Agrawal | 2014-12-31 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Template lookup now respect default locale and I18n fallbacks. | Rafael Mendonça França | 2014-12-29 | 1 | -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_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 | |
| | | | | ||||||
| * | | | Start Rails 5 development :tada: | Rafael Mendonça França | 2014-11-28 | 1 | -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 Tan | 2014-11-25 | 1 | -11/+17 | |
| | | | ||||||
| * | | 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 | |||||
| * | | 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 | |||||
| * | | Only include the needed assertions | Rafael Mendonça França | 2014-10-07 | 1 | -1/+2 | |
| | | | ||||||
| * | | fix tests on action_mailer | schneems | 2014-10-07 | 1 | -1/+1 | |
| | | | | | | | Include appropriate helpers and use `assert_dom_equal` where applicable | |||||
| * | | Preparing for 4.2.0.beta2 release | Rafael Mendonça França | 2014-09-26 | 1 | -1/+1 | |
| | | | ||||||
| * | | Allow attaching files while the mail view is rendered | Christian Felder (masone) | 2014-09-22 | 2 | -2/+3 | |
| | | | ||||||
| * | | Rename remaining :in / :at to :wait / :wait_until | Cristian Bica | 2014-09-04 | 1 | -12/+9 | |
| | | | ||||||
| * | | Active Job refactoring | Cristian Bica | 2014-09-03 | 1 | -9/+4 | |
| | | | ||||||
| * | | [ci skip] Fix a typo in the doc of MessageDelivery | yuuji.yaginuma | 2014-09-02 | 1 | -3/+3 | |
| | | | ||||||
| * | | Refer to the library name instead of the constant | Robin Dupret | 2014-08-30 | 1 | -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/rails | David Heinemeier Hansson | 2014-08-29 | 5 | -30/+109 | |
| |\ \ | ||||||
| | * \ | Merge pull request #16598 from seuros/master | Matthew Draper | 2014-08-23 | 1 | -0/+1 | |
| | |\ \ | | | | | | | | | [ActionMailer] require activejob railtie | |||||
| | | * | | [ActionMailer] require activejob railtie | Abdelkader Boudih | 2014-08-22 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | applies API guidelines to new AM docs | Xavier Noria | 2014-08-21 | 2 | -32/+32 | |
| | |/ / | ||||||
| | * | | [Rdoc] Make clear that we are sending an AR object [ci skip] | Abdelkader Boudih | 2014-08-20 | 2 | -16/+16 | |
| | | | | ||||||
| | * | | Fix typo in rdoc [ci skip] | Abdelkader Boudih | 2014-08-20 | 2 | -16/+16 | |
| | | | | ||||||
| | * | | Updated rdoc / guides / release notes related to ActiveJob / ActionMailer | Cristian Bica | 2014-08-20 | 4 | -34/+92 | |
| | | | | ||||||
| | * | | Deprecated .deliver / .deliver! to .deliver_now / .deliver_now! | Cristian Bica | 2014-08-20 | 1 | -2/+22 | |
| | | | | ||||||
| * | | | Preparing for 4.2.0.beta1 release | David Heinemeier Hansson | 2014-08-19 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Add `set_delivery_method` and `restore_delivery_method` to ↵ | Lucas Mazza | 2014-08-19 | 1 | -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. | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |