Skip to content

Commit 004ab15

Browse files
authored
Merge pull request rails#52215 from p8/railties/document-action-mailer-perform-caching
Document `action_mailer.perform_caching` in environment files. [ci-skip]
2 parents a1259c7 + a787333 commit 004ab15

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ Rails.application.configure do
4242
# Don't care if the mailer can't send.
4343
config.action_mailer.raise_delivery_errors = false
4444

45+
# Disable caching for Action Mailer templates even if Action Controller
46+
# caching is enabled.
4547
config.action_mailer.perform_caching = false
4648

4749
config.action_mailer.default_url_options = { host: "localhost", port: 3000 }

railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Rails.application.configure do
5858

5959
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
6060
config.force_ssl = true
61-
61+
6262
# Skip http-to-https redirect for the default health check endpoint.
6363
# config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
6464

@@ -85,6 +85,8 @@ Rails.application.configure do
8585

8686
<%- end -%>
8787
<%- unless options.skip_action_mailer? -%>
88+
# Disable caching for Action Mailer templates even if Action Controller
89+
# caching is enabled.
8890
config.action_mailer.perform_caching = false
8991

9092
# Ignore bad email addresses and do not raise email delivery errors.

railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ Rails.application.configure do
3737

3838
<%- end -%>
3939
<%- unless options.skip_action_mailer? -%>
40+
# Disable caching for Action Mailer templates even if Action Controller
41+
# caching is enabled.
4042
config.action_mailer.perform_caching = false
4143

4244
# Tell Action Mailer not to deliver emails to the real world.

0 commit comments

Comments
 (0)