aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
* tests, define `Rails.root` before loading Action Mailer.Yves Senn2015-11-042-8/+8
| | | | | | | | | | | | | | | | | Since `bin/test` would define `Rails.root` before loading AM but `bundle exec rake` would define it after loading AM, this lead to the following test failure when using `bin/test`: ``` --- expected +++ actual @@ -1 +1 @@ -{:location=>"/var/folders/_r/9kh50y4j0vn7zgg2p65z1lcm0000gn/T/mails"} +{:location=>"/Users/senny/Projects/rails/actionmailer/tmp/mails"} ``` This patch ensures that `Rails.root` is defined when loading AM to achieve consistent test results.
* 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.
* | Delete needless `require 'active_support/deprecation'`yui-knk2015-10-201-1/+0
| | | | | | | | | | When `require 'active_support/rails'`, 'active_support/deprecation' is automatically loaded.
* | Merge pull request #17388 from akampjes/masterArthur Nogueira Neves2015-10-123-0/+12
|\ \ | | | | | | ActionMailer https on URL with force_ssl = true
| * | ActionMailer https on URL with force_ssl = trueAndrew Kampjes2015-08-143-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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
| | |
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-10-046-13/+13
|\ \ \ | |/ / |/| |
| * | 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
| | |
* | | Added assertion for error messages for nil and unknown delivery methodsRonak Jangir2015-09-221-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 nameyuuji.yaginuma2015-09-191-1/+1
| | |
* | | Added test for `any` if called without specifying any format Ronak Jangir2015-09-182-0/+13
|/ / | | | | | | | | | | | | | | Example ````ruby mail(hash) do |format| format.any end ````
* | 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
* | Removed duplicate requiring minitest/mock as it is already required in ↵Ronak Jangir2015-08-261-1/+0
| | | | | | | | method_call_assertions
* | Removed mocha from ActionMailerRonak Jangir2015-08-204-55/+100
|/
* fix comment about which mail headers are excludedmlbileschi2015-08-111-1/+1
|
* Make silence a warning inserted by commit #4b3f8acyui-knk2015-07-301-1/+4
|
* Revert "Merge pull request #20758 from ↵Kasper Timm Hansen2015-07-074-25/+9
| | | | | | | 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-054-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 Senn2015-06-111-0/+1
|
* use our runner (`bin/test`) for framework components.Yves Senn2015-06-111-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 Dupret2015-06-091-1/+1
|
* Document config.action_mailer.deliver_later_queue_nameRafael Mendonça França2015-06-031-0/+5
| | | | | | Also add a CHANGELOG entry for #18587 [ci skip]
* Merge pull request #18587 from ↵Rafael Mendonça França2015-06-034-1/+20
|\ | | | | | | | | | | chrismcg/allow_deliver_later_queue_name_to_be_configured Allow configuration of ActionMailer queue name
| * Allow configuration of ActionMailer queue nameChris McGrath2015-06-024-1/+20
| |
* | 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
| |
* | not require mail fileGaurav Sharma2015-05-291-1/+0
| | | | | | | | | | | | ``` it added in this commit (https://github.com/rails/rails/commit/2a25c4ce6da6ea23ebdf44e7eb2d2441dbea20a1), now no warnings occur. ```
* | Remove unused package tasksArun Agrawal2015-05-281-7/+0
| | | | | | | | We are using `all:build` now.
* | Remove broken and unused release taskArun Agrawal2015-05-221-7/+0
| | | | | | | | | | - We do release with release.rb - There is no `rake/gemcutter`
* | formatting changes [ci skip]Gourav Tiwari2015-05-171-5/+6
| |
* | [ci skip] Don’t encourage `sudo gem install`claudiob2015-05-121-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'sAnkit Gupta2015-05-102-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 valueyuuji.yaginuma2015-05-093-1/+17
| |
* | 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-042-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 Mueller2015-04-301-0/+5
| | | | | | | | a subdirectory, closes #19092.
* | Make ActionMailer #cache helper a no-op, not an exceptionJavan Makhmali2015-04-281-1/+13
| |
* | mailer previews for `NullMail` instances. Closes #19849.Yves Senn2015-04-282-0/+8
| |
* | mailer previews, make sure labels and values line up.Yves Senn2015-04-281-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 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
* | Merge pull request #19753 from jonatack/use-ruby-2-2-2Guillermo Iguaran2015-04-131-1/+1
|\ \ | | | | | | Upgrade to Ruby 2.2.2
| * | Upgrade to Ruby 2.2.2Jon Atack2015-04-141-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 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
| | |