aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2016-02-06 14:54:26 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2016-02-06 15:02:02 +0900
commitea785e535eaf8eeb2cb5f3a1c025f4ebaf145f31 (patch)
tree92709a07c778dd22815b994c905cbd5b1708acfe /actionmailer/lib
parent38b5af6595338cb2212980062d9aaf51241878cc (diff)
downloadrails-ea785e535eaf8eeb2cb5f3a1c025f4ebaf145f31.tar.gz
rails-ea785e535eaf8eeb2cb5f3a1c025f4ebaf145f31.tar.bz2
rails-ea785e535eaf8eeb2cb5f3a1c025f4ebaf145f31.zip
Revert "When generating a mailer, you must specify Mailer in the class name in"
This reverts commit 8417d967e016f0219cc4ec30bf0d3908ce6cd29b. In 5697bdbb6da5d08e541a3b12251cec90269b059b and af3eb5961e55a46b011be797e71f615f20f56686, add mailer suffix to generated files and classes. Therefore, no longer need to specify `Mailer` to class name. [ci skip]
Diffstat (limited to 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
-rw-r--r--actionmailer/lib/rails/generators/mailer/USAGE2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 8285a8618e..bb3cb1be45 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -13,7 +13,7 @@ module ActionMailer
#
# To use Action Mailer, you need to create a mailer model.
#
- # $ rails generate mailer NotifierMailer
+ # $ rails generate mailer Notifier
#
# The generated model inherits from <tt>ApplicationMailer</tt> which in turn
# inherits from <tt>ActionMailer::Base</tt>. A mailer model defines methods
diff --git a/actionmailer/lib/rails/generators/mailer/USAGE b/actionmailer/lib/rails/generators/mailer/USAGE
index 9f2a6b4cd8..2b0a078109 100644
--- a/actionmailer/lib/rails/generators/mailer/USAGE
+++ b/actionmailer/lib/rails/generators/mailer/USAGE
@@ -8,7 +8,7 @@ Description:
Example:
========
- rails generate mailer NotificationsMailer signup forgot_password invoice
+ rails generate mailer Notifications signup forgot_password invoice
creates a Notifications mailer class, views, and test:
Mailer: app/mailers/notifications_mailer.rb