| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-10-31 | 1 | -1/+1 |
| |\ | |||||
| | * | Fixed wording in Assertion docs, changed ‘Assert’ -> ‘Asserts’ | Ronak Jangir | 2015-10-07 | 1 | -1/+1 |
| | | | |||||
| * | | split `process` from mailer instantiation | Aaron Patterson | 2015-10-30 | 2 | -5/+6 |
| | | | | | | | | | | | this allows us to construct mailer objects without possibly disastrous side-effects. | ||||
| * | | Merge pull request #17388 from akampjes/master | Arthur Nogueira Neves | 2015-10-12 | 2 | -0/+7 |
| |\ \ | | | | | | | ActionMailer https on URL with force_ssl = true | ||||
| | * | | ActionMailer https on URL with force_ssl = true | Andrew Kampjes | 2015-08-14 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `config.force_ssl = true` will set config.action_mailer.default_url_options = { protocol: 'https' } If you have turned on force_ssl, and then gone to the effort of setting config.action_mailer.default_url_options = {host: 'example.com'} then you are probably pointing people back to your current app and want https on that too. | ||||
| * | | | Merge pull request #21865 from Gaurav2728/test_cases_protected_method_nodoc | Sean Griffin | 2015-10-04 | 1 | -5/+5 |
| |\ \ \ | |_|/ |/| | | action mailer test cases protected method can be `# :nodoc:` [ci skip] | ||||
| | * | | action mailer test cases protected method can be `# :nodoc:` | Gaurav Sharma | 2015-10-04 | 1 | -5/+5 |
| | | | | |||||
| * | | | Add missing punctuation mark to all ActionMailer docs [ci skip] | amitkumarsuroliya | 2015-09-28 | 5 | -12/+12 |
| | | | | |||||
| * | | | Add a missing period to ActionMailer Base docs [ci skip] | amitkumarsuroliya | 2015-09-28 | 1 | -1/+1 |
| |/ / | |||||
| * / | When used by ActionMailer, ActionView should automatically use the correct ↵ | Isaac Betesh | 2015-09-09 | 1 | -0/+7 |
| |/ | | | | MIME type just as it does when used by ActionDispatch #11157 | ||||
| * | fix comment about which mail headers are excluded | mlbileschi | 2015-08-11 | 1 | -1/+1 |
| | | |||||
| * | Revert "Merge pull request #20758 from ↵ | Kasper Timm Hansen | 2015-07-07 | 2 | -5/+3 |
| | | | | | | | | xijo/action_mailer_message_delivery_respects_i18n_locale" This reverts commit f2a8c23654d69dd8f294971487b5abf0e5d891c3, reversing changes made to 3046c9bbe154aa717a5147091be8b495ed8969c4. | ||||
| * | ActionMailer::MessageDelivery respects current I18n.locale | Johannes Opper | 2015-07-05 | 2 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | When #deliver_now is called all translations within the generated email will be looked up for the current I18n locale. I18n.locale = ‘de’ mail.deliver_now # Generates german email, correct In #enqueue_delivery the locale was not considered and the resulting job uses the default locale. I18n.locale = ‘de’ mail.deliver_later # Generate english email, incorrect In order to achieve a consistent behaviour the current locale is now always passed to `ActionMailer::DeliveryJob`. | ||||
| * | Tiny documentation edits [ci skip] | Robin Dupret | 2015-06-09 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #18587 from ↵ | Rafael Mendonça França | 2015-06-03 | 3 | -1/+6 |
| |\ | | | | | | | | | | | chrismcg/allow_deliver_later_queue_name_to_be_configured Allow configuration of ActionMailer queue name | ||||
| | * | Allow configuration of ActionMailer queue name | Chris McGrath | 2015-06-02 | 3 | -1/+6 |
| | | | |||||
| * | | Make the wording less confusing | Rafael Mendonça França | 2015-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | This partially reverts commit ac02df5c7827630a91acd9a6b916db9eda1f38b4. [ci skip] | ||||
| * | | minor text change | Manish Puri | 2015-05-29 | 1 | -1/+1 |
| | | | |||||
| * | | Update inline_preview_interceptor.rb | Manish Puri | 2015-05-29 | 1 | -1/+1 |
| | | | |||||
| * | | formatting changes [ci skip] | Gourav Tiwari | 2015-05-17 | 1 | -5/+6 |
| | | | |||||
| * | | `assert_emails` in block form use the given number as expected value | yuuji.yaginuma | 2015-05-09 | 1 | -1/+1 |
| | | | |||||
| * | | 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 | 1 | -1/+49 |
| | | | | | | | | | | | Use a preview interceptor to search for inline cid: urls in src attributes and convert them to data urls. | ||||
| * | | mailer previews for `NullMail` instances. Closes #19849. | Yves Senn | 2015-04-28 | 1 | -0/+1 |
| | | | |||||
| * | | 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 | ||||
| * | | 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 |
| | | | | |||||
| * | | | [ci skip] Add code example for MailHelper#block_format documentation | Anton Davydov | 2015-03-02 | 1 | -1/+11 |
| | | | | |||||
| * | | | 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 |
| | |_|/ |/| | | |||||
| * | | | 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. | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |