1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Merge pull request #24045 from Sarah-Alsinan/patch-4

Update base.rb [ci skip]
This commit is contained in:
Kasper Timm Hansen 2016-03-04 09:36:03 +01:00
commit 86071a4049

View file

@ -289,7 +289,7 @@ module ActionMailer
#
# Note that the proc is evaluated right at the start of the mail message generation, so if you
# set something in the default using a proc, and then set the same thing inside of your
# mailer method, it will get over written by the mailer method.
# mailer method, it will get overwritten by the mailer method.
#
# It is also possible to set these default options that will be used in all mailers through
# the <tt>default_options=</tt> configuration in <tt>config/application.rb</tt>: