aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22077 from obduk/clean-up-logsKasper Timm Hansen2015-11-191-3/+3
|\ | | | | Remove newlines from start of logs
| * Remove newlines from start of logsOwen Davies2015-10-261-3/+3
| | | | | | | | | | | | Currently if using a single line logger, this causes the time stamp and log message to be on separate lines which is not common to how most other logging works.
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-10-311-1/+1
|\ \
| * | Fixed wording in Assertion docs, changed ‘Assert’ -> ‘Asserts’Ronak Jangir2015-10-071-1/+1
| | |
* | | split `process` from mailer instantiationAaron Patterson2015-10-302-5/+6
| |/ |/| | | | | | | this allows us to construct mailer objects without possibly disastrous side-effects.
* | Merge pull request #17388 from akampjes/masterArthur Nogueira Neves2015-10-122-0/+7
|\ \ | | | | | | ActionMailer https on URL with force_ssl = true
| * | ActionMailer https on URL with force_ssl = trueAndrew Kampjes2015-08-142-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_nodocSean Griffin2015-10-041-5/+5
|\ \ \ | |_|/ |/| | action mailer test cases protected method can be `# :nodoc:` [ci skip]
| * | action mailer test cases protected method can be `# :nodoc:`Gaurav Sharma2015-10-041-5/+5
| | |
* | | Add missing punctuation mark to all ActionMailer docs [ci skip]amitkumarsuroliya2015-09-285-12/+12
| | |
* | | Add a missing period to ActionMailer Base docs [ci skip]amitkumarsuroliya2015-09-281-1/+1
|/ /
* / When used by ActionMailer, ActionView should automatically use the correct ↵Isaac Betesh2015-09-091-0/+7
|/ | | | MIME type just as it does when used by ActionDispatch #11157
* fix comment about which mail headers are excludedmlbileschi2015-08-111-1/+1
|
* Revert "Merge pull request #20758 from ↵Kasper Timm Hansen2015-07-072-5/+3
| | | | | | | xijo/action_mailer_message_delivery_respects_i18n_locale" This reverts commit f2a8c23654d69dd8f294971487b5abf0e5d891c3, reversing changes made to 3046c9bbe154aa717a5147091be8b495ed8969c4.
* ActionMailer::MessageDelivery respects current I18n.localeJohannes Opper2015-07-052-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 Dupret2015-06-091-1/+1
|
* Merge pull request #18587 from ↵Rafael Mendonça França2015-06-033-1/+6
|\ | | | | | | | | | | chrismcg/allow_deliver_later_queue_name_to_be_configured Allow configuration of ActionMailer queue name
| * Allow configuration of ActionMailer queue nameChris McGrath2015-06-023-1/+6
| |
* | Make the wording less confusingRafael Mendonça França2015-05-291-1/+1
| | | | | | | | | | | | This partially reverts commit ac02df5c7827630a91acd9a6b916db9eda1f38b4. [ci skip]
* | minor text changeManish Puri2015-05-291-1/+1
| |
* | Update inline_preview_interceptor.rbManish Puri2015-05-291-1/+1
| |
* | formatting changes [ci skip]Gourav Tiwari2015-05-171-5/+6
| |
* | `assert_emails` in block form use the given number as expected valueyuuji.yaginuma2015-05-091-1/+1
| |
* | Document inline image mailer preview interceptorAndrew White2015-05-043-49/+63
| | | | | | | | Explain what the interceptor is used for and how to remove it.
* | Add support for inline images to mailer previewsAndrew White2015-05-041-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 Senn2015-04-281-0/+1
| |
* | AUTH PLAIN is Base64 encoded [ci skip]Achilleas Pipinellis2015-04-281-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 Scott2015-04-121-2/+2
| |
* | Merge branch 'action-mailer-async-doc-fixes' of ↵Zachary Scott2015-04-121-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 Fazkeas2014-12-181-8/+11
| | |
* | | [skip ci] Fix typo in actionmailer documentationAnton Davydov2015-03-151-1/+1
| | |
* | | [ci skip] Add code example for MailHelper#block_format documentationAnton Davydov2015-03-021-1/+11
| | |
* | | update docs to reflect that mailer generator add suffix to generated classes ↵yuuji.yaginuma2015-02-251-15/+15
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #18393 from y-yagi/fix_mailerRafael Mendonça França2015-02-181-2/+2
|\ \ \ | | | | | | | | follow up to #18074
| * | | follow up to #18074yuuji.yaginuma2015-01-081-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 Davydov2015-02-151-0/+2
| |_|/ |/| |
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 06:37:39 +0000