aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer
Commit message (Collapse)AuthorAgeFilesLines
* Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-011-1/+1
|
* bumping versionAaron Patterson2016-01-251-1/+1
|
* Change `alpha` to `beta1` to prep for release of Rails 5eileencodes2015-12-181-1/+1
| | | | :tada: :beers:
* [ci skip] Fix grammar and sentence framingAkshay Vishnoi2015-12-171-6/+6
|
* Make ActionMailer::Base.respond_to_missing? privateRyan Buckley2015-12-031-4/+6
|
* Replace ActionMailer::Base#respond_to? with respond_to_missing?Ryan Buckley2015-12-021-2/+2
|
* Move all nodoc methods to the private sectionRafael Mendonça França2015-11-241-43/+43
| | | | Since they are nodoc there is no need to be protected.
* Put all private method togetherRafael Mendonça França2015-11-241-36/+35
|
* Avoid mutating the headers hashRafael Mendonça França2015-11-241-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 methodRafael Mendonça França2015-11-241-1/+1
|
* Merge pull request #22120 from hnatt/refactor-actionmailerRafael Mendonça França2015-11-241-55/+59
|\ | | | | | | Refactor ActionMailer::Base
| * Rename ActionMailer::Base#class_from_value -> observer_class_forhnatt2015-10-301-4/+4
| |
| * Don't mutate headers in ActionMailer::Base#collect_responses_from_templateshnatt2015-10-301-2/+2
| |
| * Pass message as argument to ActionMailer::Base#assign_headers_to_messagehnatt2015-10-301-4/+5
| |
| * Fix indentation in ActionMailer::Base#collect_responses_from_templateshnatt2015-10-291-5/+5
| |
| * Refactor out headers to message assignment from ActionMailer::Base#mailhnatt2015-10-291-3/+6
| |
| * Use attr_internal in ActionMailer::Base#mail instead of local var for messagehnatt2015-10-291-11/+9
| |
| * Refactor out defaults handling from ActionMailer::Base#mailhnatt2015-10-291-9/+15
| |
| * Refactor ActionMailer::Base#collect_responseshnatt2015-10-291-16/+16
| |
| * Reduce code duplication in ActionMailer::Base#register_observer and ↵hnatt2015-10-291-16/+12
| | | | | | | | #register_interceptor
* | Revert "Merge pull request #18446 from ↵Sean Griffin2015-11-232-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-interceptorSean Griffin2015-11-232-19/+52
|\ \ | | | | | | | | | ActionMailer::Base can unregister interceptor(s).
| * | ActionMailer::Base can unregister interceptor(s).Claudio Ortolina2015-01-312-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-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
|/ /
* | 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-042-49/+62
| | | | | | | | | | | | 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
| | |