Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #12884 from akshay-vishnoi/refactor

Ruby's new Hash syntax applied in actionmailer
  • Loading branch information...
commit 48ea0899074629203d84e2aea02593e893b5a2a4 2 parents 93999ed + 3134605
@guilleiguaran guilleiguaran authored
View
4 actionmailer/lib/action_mailer/base.rb
@@ -517,8 +517,8 @@ def initialize(method_name=nil, *args)
def process(method_name, *args) #:nodoc:
payload = {
- :mailer => self.class.name,
- :action => method_name
+ mailer: self.class.name,
+ action: method_name
}
ActiveSupport::Notifications.instrument("process.action_mailer", payload) do
View
2  actionmailer/test/fixtures/base_mailer/email_with_translations.html.erb
@@ -1 +1 @@
-<%= t('.greet_user', :name => 'lifo') %>
+<%= t('.greet_user', name: 'lifo') %>
View
2  actionmailer/test/fixtures/test_mailer/included_subtemplate.text.erb
@@ -1 +1 @@
-Hey Ho, <%= render :partial => "subtemplate" %>
+Hey Ho, <%= render partial: "subtemplate" %>
View
2  actionmailer/test/mailers/base_mailer.rb
@@ -120,7 +120,7 @@ def without_mail_call
end
def with_nil_as_return_value
- mail(:template_name => "welcome")
+ mail(template_name: "welcome")
nil
end
Please sign in to comment.
Something went wrong with that request. Please try again.