diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2013-03-19 10:53:32 +0530 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2013-03-19 11:00:01 +0530 |
| commit | 6893c23f48d2707714240a1ae2a410a0661aa3a5 (patch) | |
| tree | 724d4a76de0c027de49458c69394bda8ce6d2f2c | |
| parent | f0d5e32f891dcfd49fb757cc8f3a0f221e3c06a8 (diff) | |
| download | rails-6893c23f48d2707714240a1ae2a410a0661aa3a5.tar.gz rails-6893c23f48d2707714240a1ae2a410a0661aa3a5.tar.bz2 rails-6893c23f48d2707714240a1ae2a410a0661aa3a5.zip | |
drop an unused hash; change slang to SPECIAL
| -rw-r--r-- | actionmailer/test/mailers/base_mailer.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/http/cache.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb index 504ca36483..20b6671283 100644 --- a/actionmailer/test/mailers/base_mailer.rb +++ b/actionmailer/test/mailers/base_mailer.rb @@ -119,7 +119,7 @@ class BaseMailer < ActionMailer::Base def without_mail_call end - def with_nil_as_return_value(hash = {}) + def with_nil_as_return_value mail(:template_name => "welcome") nil end diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb index 0d6015d993..f9b278349e 100644 --- a/actionpack/lib/action_dispatch/http/cache.rb +++ b/actionpack/lib/action_dispatch/http/cache.rb @@ -92,7 +92,7 @@ module ActionDispatch LAST_MODIFIED = "Last-Modified".freeze ETAG = "ETag".freeze CACHE_CONTROL = "Cache-Control".freeze - SPESHUL_KEYS = %w[extras no-cache max-age public must-revalidate] + SPECIAL_KEYS = %w[extras no-cache max-age public must-revalidate] def cache_control_segments if cache_control = self[CACHE_CONTROL] @@ -108,7 +108,7 @@ module ActionDispatch cache_control_segments.each do |segment| directive, argument = segment.split('=', 2) - if SPESHUL_KEYS.include? directive + if SPECIAL_KEYS.include? directive key = directive.tr('-', '_') cache_control[key.to_sym] = argument || true else |