aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
* Small typo on a method name:Edouard CHIN2016-04-151-2/+2
| | | | - clear_test_deliviers -> clear_test_deliveries
* Merge pull request #24525 from tomkadwill/action-mailer-base-docs2Vipul A M2016-04-141-3/+3
|\ | | | | Update ActionMailer base documentation [ci skip]
| * Update ActionMailer base documentation [ci skip]Tom Kadwill2016-04-131-3/+3
| |
* | Merge pull request #24497 from vipulnsward/am-changelog-passYves Senn2016-04-111-4/+3
|\ \ | | | | | | Pass over AM changelog [ci skip]
| * | Pass over AM changelogVipul A M2016-04-101-4/+3
| |/ | | | | | | | | | | | | | | - Fixed statement about setting `config.action_mailer.default_url_options = {protocol: 'https'}` . We are just setting the protocol key to 'https', not replacing/initializing the complete config. - Fixed grammar in assert_emails changlog - Added sentence separator for code ":" [ci skip]
* / Update ActionMailer Views documentation [ci skip]Tom Kadwill2016-04-101-1/+1
|/
* Merge pull request #24457 from ↵Jeremy Daer2016-04-083-2/+40
|\ | | | | | | | | jeremy/mailer/dont-deliver-later-after-message-is-loaded Disallow calling `#deliver_later` after local message modifications.
| * Disallow calling `#deliver_later` after local message modifications.Jeremy Daer2016-04-073-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They would be lost when the delivery job is enqueued, otherwise. Prevents a common, hard-to-find bug like: ```ruby message = Notifier.welcome(user, foo) message.message_id = my_generated_message_id message.deliver_later ``` The message_id is silently lost here! *Only the mailer arguments are passed to the delivery job.* This raises an exception now. Make modifications to the message within the mailer method or use a custom Active Job to manage delivery instead of using #deliver_later.
* | remove blank line generated in application_mailer.rbyuuji.yaginuma2016-04-081-1/+1
|/
* Sendmail default arguments match Mail::SendMailarktisklada2016-04-053-2/+8
| | | | Removes `-t`
* Suppress warningsyui-knk2016-03-312-6/+12
| | | | | "Using a dynamic :controller (or :action) segment in a route is deprecated" by 6520ea5f7e2215a763ca74bf6cfa87be2347d5df (#23980).
* Pass over CHANGELOGs [ci skip]Prathamesh Sonpatki2016-03-301-3/+1
|
* Merge pull request #24164 from prathamesh-sonpatki/fix-application-mailerRafael França2016-03-232-2/+13
|\ | | | | Correctly generate application_mailer.rb in mountable engines
| * Correctly generate application_mailer.rb in mountable enginesPrathamesh Sonpatki2016-03-122-2/+13
| | | | | | | | - Followup of https://github.com/rails/rails/pull/24161.
* | Fix generator test to match to use the stringRafael Mendonça França2016-03-211-1/+1
| |
* | switched layout :mailer to a string so that mail layout can be properly ↵Matt Hall2016-03-171-1/+1
|/ | | | found and mail can be delivered properly
* improve some codeSen-Zhang2016-03-111-2/+4
|
* generate application_mailer.rb if it is missingSen-Zhang2016-03-112-0/+8
|
* Remove redundant regexp escapes in generatorsGadzhi Gadzhiev2016-03-081-1/+1
|
* Prevent not-intended loading of `ActionDispatch::IntegrationTest`yui-knk2016-03-071-2/+2
| | | | | | | | | | After 9d378747326d26cf1afdac4433ead22967af0984 `ActionDispatch::IntegrationTest` class is loaded and defined in all Rails environments, not only test but also production. This is not-intended loading of a class which is only used in test environment. To prevent not-intended loading, add `ActiveSupport.run_load_hooks` to `ActionDispatch::IntegrationTest` with `action_dispatch_integration_test` name and use it in `ActionMailer`.
* Update base.rbSarah A2016-03-031-1/+1
|
* Change 'a HTML' to 'an HTML' [ci skip]Santosh Wadghule2016-03-031-1/+1
|
* Remove load_paths fileArthur Neves2016-02-271-1/+0
|
* Preparing for 5.0.0.beta3 releaseeileencodes2016-02-241-0/+2
| | | | Adds changelog headers for beta3 release
* Prep release for Rails 5 beta3eileencodes2016-02-241-1/+1
|
* Add changelog entry for #22825Rafael Mendonça França2016-02-241-0/+6
|
* Move private methods to the private visibilityRafael Mendonça França2016-02-241-12/+12
|
* Move Caching module to Abstract ControllerRafael Mendonça França2016-02-232-4/+1
| | | | | | Abstract Controller is the common component between Action Mailer and Action Controller so if we need to share the caching component it need to be there.
* Change ActionMailer's default caching configuration and update generator's ↵Stan Lo2016-02-231-1/+1
| | | | environment templates
* Move ActionMailer::Caching's content into ActionMailer::Base instead of ↵Stan Lo2016-02-233-25/+15
| | | | | | including it Remove useless helper in ActionDispatch::Caching and fix indentation
* Make caching configuration more flexibleStan Lo2016-02-231-4/+7
|
* Move most caching methods to ActionDispatch::Caching, and let ActionMailer ↵Stan Lo2016-02-232-55/+3
| | | | and ActionController to include it
* Move caching/fragments in ActionMailer and ActionController to ↵Stan Lo2016-02-232-153/+2
| | | | action_dispatch/caching/fragments
* Porting ActionController::Caching to ActionMailer::CachingStan Lo2016-02-2311-0/+481
|
* Prevent ActionMailer initializer from triggering load of ActionMailerDave Gynn2016-02-221-10/+12
| | | | | | | | the after_initialize block has been changed to use the configuration from `config.action_mailer` rather than `ActionMailer::Base` so that action mailer is not loaded before it is necessary. the mailer preview routes setup have been moved out of an `on_load(:action_mailer)` block.
* Add `internal` attribute to routesJon Moss2016-02-221-2/+2
| | | | | | | | | | | | | | This is meant to provide a way for Action Cable, Sprockets, and possibly other Rack applications to mark themselves as internal, and to exclude themselves from the routing inspector, and thus `rails routes` / `rake routes`. I think this is the only way to have mounted Rack apps be marked as internal, within AD/Journey. Another option would be to create an array of regexes for internal apps, and then to iterate over that everytime a request comes through. Also, I only had the first `add_route` method set `internal`'s default to false, to avoid littering it all over the codebase.
* fix class name typo.Yves Senn2016-02-162-3/+3
|
* reset `ActionMailer::Base.deliveries` in `ActionDispatch::IntegrationTest`.Yves Senn2016-02-163-1/+24
| | | | | | | | | Whenever you are sending emails in integration tests using the `:test` delivery method you need to make sure that `ActionMailer::Base.deliveries` is reset after every test. This piece of boilerplate code is present in all my applications that send emails. Let's have `ActionDispatch::IntegrationTest` reset the deliveries automatically.
* Change x-gzip to gzip in docs [ci skip]Mehmet Emin İNAÇ2016-02-131-2/+2
| | | | For more information about GNU zip mime type please check IETF's web site [RFC6713](http://tools.ietf.org/html/rfc6713) or [IANA](http://www.iana.org/assignments/media-types/media-types.xhtml#application)
* Revert "When generating a mailer, you must specify Mailer in the class name in"yuuji.yaginuma2016-02-062-2/+2
| | | | | | | | This reverts commit 8417d967e016f0219cc4ec30bf0d3908ce6cd29b. In 5697bdbb6da5d08e541a3b12251cec90269b059b and af3eb5961e55a46b011be797e71f615f20f56686, add mailer suffix to generated files and classes. Therefore, no longer need to specify `Mailer` to class name. [ci skip]
* When generating a mailer, you must specify Mailer in the class name inAndrew Kaspick2016-02-052-2/+2
| | | | | order to generate the proper files. Some of the docs/comments are missing this important detail.
* Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-012-1/+6
|
* Wrangle the asset build into something that sounds more generalMatthew Draper2016-02-011-0/+3
|
* 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.