Skip to content

Commit 182503c

Browse files
authored
Merge pull request rails#54702 from fatkodima/fix-action_mailer-default_options-docs
Fix `ActionMailer::Base.default` docs [skip-ci]
2 parents 2470d5b + 72629be commit 182503c

File tree

1 file changed

+2
-7
lines changed
  • actionmailer/lib/action_mailer

1 file changed

+2
-7
lines changed

actionmailer/lib/action_mailer/base.rb

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -574,18 +574,13 @@ def mailer_name
574574
attr_writer :mailer_name
575575
alias :controller_path :mailer_name
576576

577-
# Sets the defaults through app configuration:
578-
#
579-
# config.action_mailer.default(from: "[email protected]")
577+
# Allows to set defaults through app configuration:
580578
#
581-
# Aliased by ::default_options=
579+
# config.action_mailer.default_options = { from: "[email protected]" }
582580
def default(value = nil)
583581
self.default_params = default_params.merge(value).freeze if value
584582
default_params
585583
end
586-
# Allows to set defaults through app configuration:
587-
#
588-
# config.action_mailer.default_options = { from: "[email protected]" }
589584
alias :default_options= :default
590585

591586
# Wraps an email delivery inside of ActiveSupport::Notifications instrumentation.

0 commit comments

Comments
 (0)