aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2015-12-17 18:12:23 -0200
committerRafael França <rafaelmfranca@gmail.com>2015-12-17 18:12:23 -0200
commit9446e38ba47c9ca3be2ad668d8a8bea0141be6fc (patch)
treebce7c44434725163237ee4b6d2acf8cf71977cb1 /railties/lib/rails/generators/erb/mailer/mailer_generator.rb
parentb611350e7c9e5aefd3ea55c9c041f15f0f774b47 (diff)
parent293d35e256d282e3ea9d4d6277611e1e4d50dc96 (diff)
downloadrails-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 'railties/lib/rails/generators/erb/mailer/mailer_generator.rb')
-rw-r--r--railties/lib/rails/generators/erb/mailer/mailer_generator.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
index 65563aa6db..bc249aa5e5 100644
--- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
@@ -9,13 +9,6 @@ module Erb # :nodoc:
view_base_path = File.join("app/views", class_path, file_name + '_mailer')
empty_directory view_base_path
- if self.behavior == :invoke
- formats.each do |format|
- layout_path = File.join("app/views/layouts", filename_with_extensions("mailer", format))
- template filename_with_extensions(:layout, format), layout_path
- end
- end
-
actions.each do |action|
@action = action