Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Put all private method together | Rafael Mendonça França | 2015-11-24 | 1 | -36/+35 | |
| | ||||||
* | Avoid mutating the headers hash | Rafael Mendonça França | 2015-11-24 | 1 | -2/+3 | |
| | | | | | We are already filtering the keys in the assign_headers_to_message method so we can just update the filter. | |||||
* | nodoc in the private method | Rafael Mendonça França | 2015-11-24 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #22120 from hnatt/refactor-actionmailer | Rafael Mendonça França | 2015-11-24 | 1 | -55/+59 | |
|\ | | | | | | | Refactor ActionMailer::Base | |||||
| * | Rename ActionMailer::Base#class_from_value -> observer_class_for | hnatt | 2015-10-30 | 1 | -4/+4 | |
| | | ||||||
| * | Don't mutate headers in ActionMailer::Base#collect_responses_from_templates | hnatt | 2015-10-30 | 1 | -2/+2 | |
| | | ||||||
| * | Pass message as argument to ActionMailer::Base#assign_headers_to_message | hnatt | 2015-10-30 | 1 | -4/+5 | |
| | | ||||||
| * | Fix indentation in ActionMailer::Base#collect_responses_from_templates | hnatt | 2015-10-29 | 1 | -5/+5 | |
| | | ||||||
| * | Refactor out headers to message assignment from ActionMailer::Base#mail | hnatt | 2015-10-29 | 1 | -3/+6 | |
| | | ||||||
| * | Use attr_internal in ActionMailer::Base#mail instead of local var for message | hnatt | 2015-10-29 | 1 | -11/+9 | |
| | | ||||||
| * | Refactor out defaults handling from ActionMailer::Base#mail | hnatt | 2015-10-29 | 1 | -9/+15 | |
| | | ||||||
| * | Refactor ActionMailer::Base#collect_responses | hnatt | 2015-10-29 | 1 | -16/+16 | |
| | | ||||||
| * | Reduce code duplication in ActionMailer::Base#register_observer and ↵ | hnatt | 2015-10-29 | 1 | -16/+12 | |
| | | | | | | | | #register_interceptor | |||||
* | | Revert "Merge pull request #18446 from ↵ | Sean Griffin | 2015-11-23 | 2 | -52/+19 | |
| | | | | | | | | | | | | | | | | | | cloud8421/actionmailer-unregister-interceptor" This reverts commit 65a61ab7c370d2894c11ce276725f723a5c9c111, reversing changes made to 14314ca18302f18c3d8bb7a63e9f71ac4c2290c2. This PR broke the build | |||||
* | | Merge pull request #18446 from cloud8421/actionmailer-unregister-interceptor | Sean Griffin | 2015-11-23 | 2 | -19/+52 | |
|\ \ | | | | | | | | | | ActionMailer::Base can unregister interceptor(s). | |||||
| * | | ActionMailer::Base can unregister interceptor(s). | Claudio Ortolina | 2015-01-31 | 2 | -19/+51 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One or multiple mail interceptors can be unregistered using `ActionMailer::Base.unregister_interceptors` or `ActionMailer::Base.unregister_interceptor`. For preview interceptors, it's possible to use `ActionMailer::Base.unregister_preview_interceptors` or `ActionMailer::Base.unregister_preview_interceptor`. Refactors logic to constantize a string/symbol into separate method. | |||||
* | | | Merge pull request #22077 from obduk/clean-up-logs | Kasper Timm Hansen | 2015-11-19 | 1 | -3/+3 | |
|\ \ \ | | | | | | | | | Remove newlines from start of logs | |||||
| * | | | Remove newlines from start of logs | Owen Davies | 2015-10-26 | 1 | -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/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 |