aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/rails
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-07 13:09:22 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-07 13:09:22 -0700
commit221211088bc2a0421dc641355017d3ba78b25cc5 (patch)
tree893ed86433062fb3ef11e9f0e0d8d64ebbf3405e /actionmailer/lib/rails
parent918f7038b3d4d4180a4d1056bb4b7b3f3b85508f (diff)
parent96f290eac03e1241fc1e57f119eaca72b682c5af (diff)
downloadrails-221211088bc2a0421dc641355017d3ba78b25cc5.tar.gz
rails-221211088bc2a0421dc641355017d3ba78b25cc5.tar.bz2
rails-221211088bc2a0421dc641355017d3ba78b25cc5.zip
Merge pull request #7869 from Locke23rus/actionmailer_new_hash_syntax
Update actionmailer with new hash syntax. Just to make clear we don't accept this kind of pull request because it can invalidate a lot of pull requests. I'm accepting this because Action Mailer has only two open pull requests.
Diffstat (limited to 'actionmailer/lib/rails')
-rw-r--r--actionmailer/lib/rails/generators/mailer/mailer_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb
index dd7fa640c9..d5bf864595 100644
--- a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb
+++ b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb
@@ -3,7 +3,7 @@ module Rails
class MailerGenerator < NamedBase
source_root File.expand_path("../templates", __FILE__)
- argument :actions, :type => :array, :default => [], :banner => "method method"
+ argument :actions, type: :array, default: [], banner: "method method"
check_class_collision
def create_mailer_file