1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Commit graph

825 commits

Author SHA1 Message Date
Isaac Betesh
efadc69daa When used by ActionMailer, ActionView should automatically use the correct MIME type just as it does when used by ActionDispatch 2015-09-09 08:44:37 -04:00
mlbileschi
738be4457b fix comment about which mail headers are excluded 2015-08-11 16:30:47 -04:00
Kasper Timm Hansen
062cbd18dd Revert "Merge pull request from xijo/action_mailer_message_delivery_respects_i18n_locale"
This reverts commit f2a8c23654, reversing
changes made to 3046c9bbe1.
2015-07-07 22:11:20 +02:00
Johannes Opper
ca2387eb01 ActionMailer::MessageDelivery respects current I18n.locale
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`.
2015-07-05 20:21:25 +02:00
Robin Dupret
0b57f090c9 Tiny documentation edits [ci skip] 2015-06-09 11:49:33 +02:00
Rafael Mendonça França
cecbf9ed32 Merge pull request from chrismcg/allow_deliver_later_queue_name_to_be_configured
Allow configuration of ActionMailer queue name
2015-06-03 13:25:32 -03:00
Chris McGrath
f5a131aaea Allow configuration of ActionMailer queue name 2015-06-02 10:49:49 +01:00
Rafael Mendonça França
b42d770b3b Make the wording less confusing
This partially reverts commit ac02df5c78.

[ci skip]
2015-05-29 15:24:13 -03:00
Manish Puri
9575f4fdca minor text change 2015-05-29 13:50:12 -04:00
Manish Puri
ac02df5c78 Update inline_preview_interceptor.rb 2015-05-29 13:44:46 -04:00
Gourav Tiwari
4547d87853 formatting changes [ci skip] 2015-05-17 10:41:27 -07:00
yuuji.yaginuma
49a59cc6a5 assert_emails in block form use the given number as expected value 2015-05-09 18:59:59 +09:00
Andrew White
faaed863dd Document inline image mailer preview interceptor
Explain what the interceptor is used for and how to remove it.
2015-05-04 19:46:51 +01:00
Andrew White
60239f3e5a Add support for inline images to mailer previews
Use a preview interceptor to search for inline cid: urls in src
attributes and convert them to data urls.
2015-05-04 10:56:59 +01:00
Yves Senn
767d60156b mailer previews for NullMail instances. Closes . 2015-04-28 16:00:08 +02:00
Achilleas Pipinellis
e7d2cef1f4 AUTH PLAIN is Base64 encoded [ci skip]
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
2015-04-28 11:49:13 +03:00
Zachary Scott
a647277fb9 Since the delegator wasn't identified earlier, we should here [ci skip] 2015-04-12 13:29:58 -07:00
Zachary Scott
1ffd603712 Merge branch 'action-mailer-async-doc-fixes' of https://github.com/mfazekas/rails into mfazekas-action-mailer-async-doc-fixes
Conflicts:
	actionmailer/lib/action_mailer/base.rb
2015-04-12 13:28:10 -07:00
Anton Davydov
91744696a4 [skip ci] Fix typo in actionmailer documentation 2015-03-15 23:32:24 +03:00
Anton Davydov
435aa7e34f [ci skip] Add code example for MailHelper#block_format documentation 2015-03-02 15:01:57 +03:00
yuuji.yaginuma
5ef18712c5 update docs to reflect that mailer generator add suffix to generated classes [ci skip] 2015-02-25 19:22:33 +09:00
Rafael Mendonça França
39c936b760 Merge pull request from y-yagi/fix_mailer
follow up to 
2015-02-18 19:05:07 -02:00
Anton Davydov
44a49e5534 Added default values for #format_paragraph docs [skip ci] 2015-02-15 20:29:58 +03:00
Rafael Mendonça França
855cca0662 Merge pull request from andrewvida/master
Correct the views that the mail method sends in API docs.
2015-01-14 17:47:52 -02:00
Andrew Vida
29a2977af5 Correct views mail method sends in API docs 2015-01-14 14:43:58 -05:00
Carlos Souza
6870d48d19 Add _mailer suffix to i18n path
For mailers created via generators

Follow up to 
2015-01-08 22:24:22 -05:00
George Claghorn
3f17fbd68d Add assert_enqueued_emails and assert_no_enqueued_emails 2015-01-08 09:41:22 -05:00
yuuji.yaginuma
af3eb5961e follow up to
* ignore mailer suffix when generate test files
* add mailer suffix to view files
2015-01-08 22:21:54 +09:00
Carlos Souza
5697bdbb6d Add mailer suffix to generated files and classes
Following the same naming convention used in
controllers and jobs.
2015-01-06 10:46:22 -05:00
Rafael Mendonça França
bf7b8c193f Remove unneeded requires
These requires were added only to change deprecation message
2015-01-04 12:11:03 -03:00
claudiob
755dcd0691 Remove deprecated ActionMailer deliver & deliver!
These methods were deprecated in Rails 4.2 (see f4ee1147) so they can
be safely removed in Rails 5.0.
2015-01-04 11:58:41 -03:00
Arun Agrawal
4de18d0ead Update copyright notices to 2015 [ci skip] 2014-12-31 08:34:14 +01:00
Rafael Mendonça França
ecb1981bfd Template lookup now respect default locale and I18n fallbacks.
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 .
2014-12-29 23:48:35 -03:00
Yves Senn
ced687fe71 Merge pull request from y-yagi/fix_nodoc_typo
fix typo in nodoc [ci skip]
2014-12-23 08:42:51 +01:00
yuuji.yaginuma
2a110fcfc8 fix typo in nodoc 2014-12-23 16:03:17 +09:00
Miklos Fazkeas
660e1abd63 Fixes to inaccurate documentation in action_mailer [ci skip] 2014-12-18 11:36:02 +01:00
Rafael Mendonça França
c8284c8025 Merge pull request from GBH/globbing_route_mailer_preview
fixing mailer previews for apps with globbing route
2014-12-08 15:10:47 -02:00
Rafael Mendonça França
da13b9aedc Merge pull request from y-yagi/donot_delete_mailer_layouts
Don't remove mailer layouts files
2014-12-04 18:29:50 -02:00
Oleg
ccc3ddb776 fixing mailer previews for apps with globbing route 2014-12-03 10:43:12 -05:00
Sven Pachnit
e1408971b8 Fix documentation for #default
Just a little syntax error I spotted by accident. Cannot pass hash with curly braces without normal parentheses.
2014-12-01 19:26:50 +01:00
yuuji.yaginuma
c15d3fb0da [ci skip] fix description of url_for 2014-11-30 10:18:07 +09:00
Erik Michaels-Ober
d1374f99bf Pass symbol as an argument instead of a block 2014-11-29 11:53:24 +01:00
Rafael Mendonça França
f25ad07f5a Start Rails 5 development 🎉
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.
2014-11-28 15:00:06 -02:00
yuuji.yaginuma
f9411b464d Don't remove mailer layouts files 2014-11-27 14:36:10 +09:00
Guo Xiang Tan
ec49324bd7 Update docs to reflect changes to MailerGenerator. 2014-11-25 09:56:49 +08:00
Andy Jeffries
a58da25d90 Removing unnecessary File.join calls 2014-11-24 09:37:49 +00:00
Andy Jeffries
38cfaa8285 Creates an ApplicationMailer and layout by default, including html and body tags to reduce spam score 2014-11-21 16:46:49 +00:00
Godfrey Chan
4daebedcc4 Prepare for 4.2.0.beta4 release 2014-10-30 14:12:24 -07:00
Xavier Noria
e595d91ac2 edit pass over all warnings
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.
2014-10-28 17:47:32 -07:00
Xavier Noria
b3bfa361c5 let's warn with heredocs
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.
2014-10-28 16:35:24 -07:00