diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-02-02 22:14:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 22:14:34 +0100 |
| commit | 91c6eb602ad72c5b830cd5242f39768f90cf72dc (patch) | |
| tree | 57ffdd10ad54c6def5cf02a05ed571cff6a04e4b /railties | |
| parent | 2b7a38a4b1da16a8854a8e4326ee5b362850f3d2 (diff) | |
| parent | 5ed975507c8e88075cdc922426aa004cd5dc1f0c (diff) | |
| download | rails-91c6eb602ad72c5b830cd5242f39768f90cf72dc.tar.gz rails-91c6eb602ad72c5b830cd5242f39768f90cf72dc.tar.bz2 rails-91c6eb602ad72c5b830cd5242f39768f90cf72dc.zip | |
Merge pull request #27880 from y-yagi/generate_mailer_layout_files_only_when_it_does_not_exist
generate mailer layout files only when it does not exist
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/erb/mailer/mailer_generator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb index d74b5655d5..3f1d9932f6 100644 --- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb @@ -12,7 +12,7 @@ module Erb # :nodoc: if behavior == :invoke formats.each do |format| layout_path = File.join("app/views/layouts", class_path, filename_with_extensions("mailer", format)) - template filename_with_extensions(:layout, format), layout_path + template filename_with_extensions(:layout, format), layout_path unless File.exist?(layout_path) end end |