diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-02-06 09:00:07 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-02-06 09:00:07 +0100 |
| commit | c2b47916aae34a1f0fe1458a1351f57171ede0d7 (patch) | |
| tree | 92709a07c778dd22815b994c905cbd5b1708acfe | |
| parent | 38b5af6595338cb2212980062d9aaf51241878cc (diff) | |
| parent | ea785e535eaf8eeb2cb5f3a1c025f4ebaf145f31 (diff) | |
| download | rails-c2b47916aae34a1f0fe1458a1351f57171ede0d7.tar.gz rails-c2b47916aae34a1f0fe1458a1351f57171ede0d7.tar.bz2 rails-c2b47916aae34a1f0fe1458a1351f57171ede0d7.zip | |
Merge pull request #23514 from y-yagi/revert_mailer_doc_fix
Revert "When generating a mailer, you must specify Mailer in the class name in"
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 | ||||
| -rw-r--r-- | actionmailer/lib/rails/generators/mailer/USAGE | 2 |
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 |