Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed wording in Assertion docs, changed ‘Assert’ -> ‘Asserts’ | Ronak Jangir | 2015-10-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-10-04 | 6 | -13/+13 |
|\ | |||||
| * | 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 |
| | | |||||
* | | Added assertion for error messages for nil and unknown delivery methods | Ronak Jangir | 2015-09-22 | 1 | -2/+4 |
| | | | | | | As `deliver_now` `RuntimeError` for both nil & unknown delivery method so it’s good to have assertion for error messages | ||||
* | | change test method name to the appropriate name | yuuji.yaginuma | 2015-09-19 | 1 | -1/+1 |
| | | |||||
* | | Added test for `any` if called without specifying any format | Ronak Jangir | 2015-09-18 | 2 | -0/+13 |
|/ | | | | | | | | Example ````ruby mail(hash) do |format| format.any end ```` | ||||
* | 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 | ||||
* | Removed duplicate requiring minitest/mock as it is already required in ↵ | Ronak Jangir | 2015-08-26 | 1 | -1/+0 |
| | | | | method_call_assertions | ||||
* | Removed mocha from ActionMailer | Ronak Jangir | 2015-08-20 | 4 | -55/+100 |
| | |||||
* | fix comment about which mail headers are excluded | mlbileschi | 2015-08-11 | 1 | -1/+1 |
| | |||||
* | Make silence a warning inserted by commit #4b3f8ac | yui-knk | 2015-07-30 | 1 | -1/+4 |
| | |||||
* | Revert "Merge pull request #20758 from ↵ | Kasper Timm Hansen | 2015-07-07 | 4 | -25/+9 |
| | | | | | | | 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 | 4 | -9/+25 |
| | | | | | | | | | | | | | | | | | | 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`. | ||||
* | select the AR adapter through `bin/test`. | Yves Senn | 2015-06-11 | 1 | -0/+1 |
| | |||||
* | use our runner (`bin/test`) for framework components. | Yves Senn | 2015-06-11 | 1 | -0/+3 |
| | | | | | | | | | | This adds a script `bin/test` to most Rails framework components. The script uses the rails minitest plugin to augment the runner. See https://github.com/rails/rails/pull/19571 for details about the plugin. I did not yet add `bin/test` for activerecord, activejob and railties. These components rely on specific setup performed in the rake-tasks. | ||||
* | Tiny documentation edits [ci skip] | Robin Dupret | 2015-06-09 | 1 | -1/+1 |
| | |||||
* | Document config.action_mailer.deliver_later_queue_name | Rafael Mendonça França | 2015-06-03 | 1 | -0/+5 |
| | | | | | | Also add a CHANGELOG entry for #18587 [ci skip] | ||||
* | Merge pull request #18587 from ↵ | Rafael Mendonça França | 2015-06-03 | 4 | -1/+20 |
|\ | | | | | | | | | | | 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 | 4 | -1/+20 |
| | | |||||
* | | 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 |
| | | |||||
* | | not require mail file | Gaurav Sharma | 2015-05-29 | 1 | -1/+0 |
| | | | | | | | | | | | | ``` it added in this commit (https://github.com/rails/rails/commit/2a25c4ce6da6ea23ebdf44e7eb2d2441dbea20a1), now no warnings occur. ``` | ||||
* | | Remove unused package tasks | Arun Agrawal | 2015-05-28 | 1 | -7/+0 |
| | | | | | | | | We are using `all:build` now. | ||||
* | | Remove broken and unused release task | Arun Agrawal | 2015-05-22 | 1 | -7/+0 |
| | | | | | | | | | | - We do release with release.rb - There is no `rake/gemcutter` | ||||
* | | formatting changes [ci skip] | Gourav Tiwari | 2015-05-17 | 1 | -5/+6 |
| | | |||||
* | | [ci skip] Don’t encourage `sudo gem install` | claudiob | 2015-05-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | I think we are better off leaving `sudo` outside of the documented way of installing gems (`activerecord`, `actionpack`, …). We don’t want newbies to think that `sudo` is required or, even worse, than they actually have to type `[sudo] gem install`. In most scenarios, `sudo` is not needed to install gems, and people who do need it, probably already know about it. What do you think? :grin: | ||||
* | | not needed require's | Ankit Gupta | 2015-05-10 | 2 | -2/+0 |
| | | | | | | | | | | - as core_ext is not used and test pass locally - mail is already required in abstract_unit | ||||
* | | `assert_emails` in block form use the given number as expected value | yuuji.yaginuma | 2015-05-09 | 3 | -1/+17 |
| | | |||||
* | | 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 | 2 | -1/+54 |
| | | | | | | | | | | Use a preview interceptor to search for inline cid: urls in src attributes and convert them to data urls. | ||||
* | | Mailer preview now uses `url_for` to fix links to emails for apps running on ↵ | Remo Mueller | 2015-04-30 | 1 | -0/+5 |
| | | | | | | | | a subdirectory, closes #19092. | ||||
* | | Make ActionMailer #cache helper a no-op, not an exception | Javan Makhmali | 2015-04-28 | 1 | -1/+13 |
| | | |||||
* | | mailer previews for `NullMail` instances. Closes #19849. | Yves Senn | 2015-04-28 | 2 | -0/+8 |
| | | |||||
* | | mailer previews, make sure labels and values line up. | Yves Senn | 2015-04-28 | 1 | -0/+4 |
| | | | | | | | | | | | | While this was true before when every `dd` had a value, this patch makes sure that everything keeps lining up even when the `dd` node is blank. | ||||
* | | 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 | ||||
* | | Merge pull request #19753 from jonatack/use-ruby-2-2-2 | Guillermo Iguaran | 2015-04-13 | 1 | -1/+1 |
|\ \ | | | | | | | Upgrade to Ruby 2.2.2 | ||||
| * | | Upgrade to Ruby 2.2.2 | Jon Atack | 2015-04-14 | 1 | -1/+1 |
| | | | | | | | | | | | | and fix the grammar in the ruby_version_check.rb user message. | ||||
* | | | 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 |
| | | | |||||
* | | | Target Ruby 2.2.1 in gemspecs | Peter Suschlik | 2015-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | This is a follow-up to #19257 | ||||
* | | | Revert "Leave all our tests as order_dependent! for now" | Matthew Draper | 2015-03-06 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2f52f969885b2834198de0045748436a4651a94e. Conflicts: actionmailer/test/abstract_unit.rb actionview/test/abstract_unit.rb activemodel/test/cases/helper.rb activerecord/test/cases/helper.rb activesupport/test/abstract_unit.rb railties/test/abstract_unit.rb | ||||
* | | | Merge pull request #19133 from davydovanton/update-doc-example-mail-block-format | Robin Dupret | 2015-03-02 | 1 | -1/+11 |
|\ \ \ | | | | | | | | | [ci skip] Add code example for MailHelper#block_format documentation | ||||
| * | | | [ci skip] Add code example for MailHelper#block_format documentation | Anton Davydov | 2015-03-02 | 1 | -1/+11 |
| | | | | |||||
* | | | | Removing unused mailer templates | Thiago Pradi | 2015-03-01 | 18 | -50/+0 |
|/ / / | |||||
* | | | 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 |