aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '5-0-beta-sec'Aaron Patterson2016-01-251-1/+1
|\ | | | | | | | | | | | | | | | | | | | | * 5-0-beta-sec: bumping version fix version update task to deal with .beta1.1 Eliminate instance level writers for class accessors allow :file to be outside rails root, but anything else must be inside the rails view directory Don't short-circuit reject_if proc stop caching mime types globally use secure string comparisons for basic auth username / password
| * bumping versionAaron Patterson2016-01-251-1/+1
| |
* | Revert "Merge pull request #23218 from karlfreeman/bump_mail"Rafael Mendonça França2016-01-241-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 62aa850fee2070ec3e2d9e4f925dfd7790d27b5e, reversing changes made to 8c1f248c58ba65a786ae295def325c8982e7f431. There is no reason to disallow mail 2.5 so we don't need to bump the version constraint since people are still able to use mail 2.6 and get all the memory saving that was pointed in the pull request description.
* | Bump mail gem constraint from [~> 2.5, >= 2.5.4] to ~> 2.6Karl Freeman2016-01-241-1/+1
| | | | | | | | | | | | | | | | Mails downstream dependency (Mime-types) has been shown to decrease memory usage significantly in its 3.0 release. This memory decrease will be a big win for users upgrading to Rails 5. Lets nudge users to upgrade Mail alongside Rails.
* | Update copyright notice for 2016Guillermo Iguaran2016-01-011-1/+1
| |
* | Update copyright notices to 2016 [ci skip]Rashmi Yadav2015-12-311-1/+1
| |
* | Remove not used test fixtureyui-knk2015-12-301-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 Senn2015-12-221-2/+2
| | | | | | | | [ci skip]
* | No more no changes entries in the CHANGELOGsGenadi Samokovarov2015-12-211-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.beta1eileencodes2015-12-181-0/+5
|
* Change `alpha` to `beta1` to prep for release of Rails 5eileencodes2015-12-181-1/+1
| | | | :tada: :beers:
* Same gemspec formats everywhereDavid Heinemeier Hansson2015-12-181-1/+1
|
* ApplicationMailer should be generated by default just like every other ↵David Heinemeier Hansson2015-12-172-7/+0
| | | | Application* parent
* [ci skip] Fix grammar and sentence framingAkshay Vishnoi2015-12-171-6/+6
|
* [ci skip] Add a dollar sign to each command in the READMEsElektron1c972015-12-061-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? 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-234-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-interceptorSean Griffin2015-11-234-19/+137
|\ \ | | | | | | | | | ActionMailer::Base can unregister interceptor(s).
| * | ActionMailer::Base can unregister interceptor(s).Claudio Ortolina2015-01-314-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-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.
* | | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 02:06:22 +0000