aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/rails/app/app_generator.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-12-17 12:47:49 +0100
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-17 17:35:20 -0200
commit293d35e256d282e3ea9d4d6277611e1e4d50dc96 (patch)
tree90b07e3578136f269563f4bb9203c84e8c16fd21 /railties/lib/rails/generators/rails/app/app_generator.rb
parent80ba81d2a05987681301f40804469a7cf42ed4fe (diff)
downloadrails-293d35e256d282e3ea9d4d6277611e1e4d50dc96.tar.gz
rails-293d35e256d282e3ea9d4d6277611e1e4d50dc96.tar.bz2
rails-293d35e256d282e3ea9d4d6277611e1e4d50dc96.zip
ApplicationMailer should be generated by default just like every other Application* parent
Diffstat (limited to 'railties/lib/rails/generators/rails/app/app_generator.rb')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 2a3f16c02e..44bbc478d0 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -59,8 +59,6 @@ module Rails
keep_file 'app/assets/images'
keep_file 'app/assets/javascripts/channels' unless options[:skip_action_cable]
- keep_file 'app/mailers'
-
keep_file 'app/controllers/concerns'
keep_file 'app/models/concerns'
end
@@ -301,6 +299,14 @@ module Rails
end
end
+ def delete_action_mailer_files_skipping_action_mailer
+ if options[:skip_action_mailer]
+ remove_file 'app/mailers/application_mailer.rb'
+ remove_file 'app/views/layouts/mailer.html.erb'
+ remove_file 'app/views/layouts/mailer.text.erb'
+ end
+ end
+
def delete_active_record_initializers_skipping_active_record
if options[:skip_active_record]
remove_file 'config/initializers/active_record_belongs_to_required_by_default.rb'