diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 | ||||
| -rw-r--r-- | actionmailer/lib/rails/generators/mailer/USAGE | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 5a4ba5c33d..ae38617b99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,8 @@ env: - "GEM=aj:integration" - "GEM=guides" rvm: - - 2.2 - - 2.3 + - 2.2.4 + - 2.3.0 - ruby-head matrix: allow_failures: 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 |