diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-03-21 14:06:33 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-03-21 14:06:33 -0300 |
| commit | d4f220a27bf7b241c19ac9a303adf031733c2ff6 (patch) | |
| tree | 9e5e494b82a67214da5c593f4ba8248ec409c11a /actionmailer | |
| parent | 8a8325766a870df0abcf4662fb71660173737253 (diff) | |
| parent | 94ee86c1626373bc6caa44ef512f319e4139fa9e (diff) | |
| download | rails-d4f220a27bf7b241c19ac9a303adf031733c2ff6.tar.gz rails-d4f220a27bf7b241c19ac9a303adf031733c2ff6.tar.bz2 rails-d4f220a27bf7b241c19ac9a303adf031733c2ff6.zip | |
Merge pull request #24231 from hallmatt/master
switched layout :mailer to a string so that mail layout can be properly sent
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb index 02e8d3e454..71fe4d162d 100644 --- a/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb +++ b/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb @@ -1,4 +1,4 @@ class ApplicationMailer < ActionMailer::Base default from: 'from@example.com' - layout :mailer + layout "mailer" end |