diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2015-12-17 18:12:23 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2015-12-17 18:12:23 -0200 |
| commit | 9446e38ba47c9ca3be2ad668d8a8bea0141be6fc (patch) | |
| tree | bce7c44434725163237ee4b6d2acf8cf71977cb1 /actionmailer/lib/rails/generators/mailer | |
| parent | b611350e7c9e5aefd3ea55c9c041f15f0f774b47 (diff) | |
| parent | 293d35e256d282e3ea9d4d6277611e1e4d50dc96 (diff) | |
| download | rails-9446e38ba47c9ca3be2ad668d8a8bea0141be6fc.tar.gz rails-9446e38ba47c9ca3be2ad668d8a8bea0141be6fc.tar.bz2 rails-9446e38ba47c9ca3be2ad668d8a8bea0141be6fc.zip | |
Merge pull request #22627 from rails/application-mailer-by-default
ApplicationMailer should be generated by default just like every other Application* parent
Diffstat (limited to 'actionmailer/lib/rails/generators/mailer')
| -rw-r--r-- | actionmailer/lib/rails/generators/mailer/mailer_generator.rb | 3 | ||||
| -rw-r--r-- | actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb index 3ec7d3d896..5a5c9d32bb 100644 --- a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb +++ b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb @@ -9,9 +9,6 @@ module Rails def create_mailer_file template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}_mailer.rb") - if self.behavior == :invoke - template "application_mailer.rb", 'app/mailers/application_mailer.rb' - end end hook_for :template_engine, :test_framework diff --git a/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb deleted file mode 100644 index d25d8892dd..0000000000 --- a/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb +++ /dev/null @@ -1,4 +0,0 @@ -class ApplicationMailer < ActionMailer::Base - default from: "from@example.com" - layout 'mailer' -end |