Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update copyright notices to 2016 [ci skip] | Rashmi Yadav | 2015-12-31 | 1 | -1/+1 |
| | |||||
* | Remove not used test fixture | yui-knk | 2015-12-30 | 1 | -1/+0 |
| | | | | | | 'actionmailer/test/mailers/async_mailer.rb' was deleted by f9da785d0b1b22317cfca25c15fb555e9016accb . This template is not used now. | ||||
* | release notes, extract notable changes from Action Mailer CHANGELOG. | Yves Senn | 2015-12-22 | 1 | -2/+2 |
| | | | | [ci skip] | ||||
* | No more no changes entries in the CHANGELOGs | Genadi Samokovarov | 2015-12-21 | 1 | -3/+0 |
| | | | | | | | | | | | | | | During the `5.0.0.beta1` release, the CHANGELOGs got an entry like the following: ``` * No changes. ``` It is kinda confusing as there are indeed changes after it. Not a biggie, just a small pass over the CHANGELOGs. [ci skip] | ||||
* | Add CHANGELOG headers for Rails 5.0.0.beta1 | eileencodes | 2015-12-18 | 1 | -0/+5 |
| | |||||
* | Change `alpha` to `beta1` to prep for release of Rails 5 | eileencodes | 2015-12-18 | 1 | -1/+1 |
| | | | | :tada: :beers: | ||||
* | Same gemspec formats everywhere | David Heinemeier Hansson | 2015-12-18 | 1 | -1/+1 |
| | |||||
* | ApplicationMailer should be generated by default just like every other ↵ | David Heinemeier Hansson | 2015-12-17 | 2 | -7/+0 |
| | | | | Application* parent | ||||
* | [ci skip] Fix grammar and sentence framing | Akshay Vishnoi | 2015-12-17 | 1 | -6/+6 |
| | |||||
* | [ci skip] Add a dollar sign to each command in the READMEs | Elektron1c97 | 2015-12-06 | 1 | -2/+1 |
| | | | | | | According to pr #22443 in the guides there's always a dollar sign before every command, so why is in the main README a `$` and in every submodule a `%`? Just eye candy.. | ||||
* | Make ActionMailer::Base.respond_to_missing? private | Ryan Buckley | 2015-12-03 | 1 | -4/+6 |
| | |||||
* | Replace ActionMailer::Base#respond_to? with respond_to_missing? | Ryan Buckley | 2015-12-02 | 1 | -2/+2 |
| | |||||
* | Move all nodoc methods to the private section | Rafael Mendonça França | 2015-11-24 | 1 | -43/+43 |
| | | | | Since they are nodoc there is no need to be protected. | ||||
* | 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 | 4 | -137/+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 | 4 | -19/+137 |
|\ \ | | | | | | | | | | ActionMailer::Base can unregister interceptor(s). | ||||
| * | | ActionMailer::Base can unregister interceptor(s). | Claudio Ortolina | 2015-01-31 | 4 | -19/+136 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | tests, define `Rails.root` before loading Action Mailer. | Yves Senn | 2015-11-04 | 2 | -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/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. | ||||
* | | | Delete needless `require 'active_support/deprecation'` | yui-knk | 2015-10-20 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | When `require 'active_support/rails'`, 'active_support/deprecation' is automatically loaded. | ||||
* | | | Merge pull request #17388 from akampjes/master | Arthur Nogueira Neves | 2015-10-12 | 3 | -0/+12 |
|\ \ \ | | | | | | | | | ActionMailer https on URL with force_ssl = true | ||||
| * | | | ActionMailer https on URL with force_ssl = true | Andrew Kampjes | 2015-08-14 | 3 | -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_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 |
| | | | | |||||
* | | | | 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 |
| | |