diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-12-04 18:29:50 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-12-04 18:29:50 -0200 |
| commit | da13b9aedccf437df933eb8620c0029b6a502aa1 (patch) | |
| tree | 73059526fc016781f5dd9e3126d74688b8aff697 /actionmailer/lib | |
| parent | 191ea4b85b6878feedc1b18d0dcf56d2825895a1 (diff) | |
| parent | f9411b464dd477131540d32bed1fa8f18ef5ee4c (diff) | |
| download | rails-da13b9aedccf437df933eb8620c0029b6a502aa1.tar.gz rails-da13b9aedccf437df933eb8620c0029b6a502aa1.tar.bz2 rails-da13b9aedccf437df933eb8620c0029b6a502aa1.zip | |
Merge pull request #17797 from y-yagi/donot_delete_mailer_layouts
Don't remove mailer layouts files
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/rails/generators/mailer/mailer_generator.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb index 094ec85114..83f8a67da7 100644 --- a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb +++ b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb @@ -8,7 +8,9 @@ module Rails def create_mailer_file template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}.rb") - template "application_mailer.rb", 'app/mailers/application_mailer.rb' + if self.behavior == :invoke + template "application_mailer.rb", 'app/mailers/application_mailer.rb' + end end hook_for :template_engine, :test_framework |