diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-03 13:14:10 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-03 13:14:10 -0800 |
| commit | 05fb650d3179106e9de466a1575a74dec53db6b2 (patch) | |
| tree | 7e4a7322121c36262645f8a7e8761df3c441b78f | |
| parent | fdd6271e1bd61bbe19069224de0dc124da690ff1 (diff) | |
| parent | 975493a17202b7fc8da0bccb3d5caaf2bd0851d8 (diff) | |
| download | rails-05fb650d3179106e9de466a1575a74dec53db6b2.tar.gz rails-05fb650d3179106e9de466a1575a74dec53db6b2.tar.bz2 rails-05fb650d3179106e9de466a1575a74dec53db6b2.zip | |
Merge pull request #8730 from robin850/master
Fix missing spaces in method definitions
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/collector.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index a3c0b2c6bd..9ba606c045 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -530,7 +530,7 @@ module ActionMailer # The resulting Mail::Message will have the following in its header: # # X-Special-Domain-Specific-Header: SecretValue - def headers(args=nil) + def headers(args = nil) if args @_message.headers(args) else @@ -660,7 +660,7 @@ module ActionMailer # format.html # end # - def mail(headers={}, &block) + def mail(headers = {}, &block) @_mail_was_called = true m = @_message diff --git a/actionmailer/lib/action_mailer/collector.rb b/actionmailer/lib/action_mailer/collector.rb index cbb2778fae..e8883a8235 100644 --- a/actionmailer/lib/action_mailer/collector.rb +++ b/actionmailer/lib/action_mailer/collector.rb @@ -20,7 +20,7 @@ module ActionMailer end alias :all :any - def custom(mime, options={}) + def custom(mime, options = {}) options.reverse_merge!(content_type: mime.to_s) @context.formats = [mime.to_sym] options[:body] = block_given? ? yield : @default_render.call |