Merge pull request rails#9792 from vipulnsward/drop_unused_hash

drop an unused hash; change slang to SPECIAL
jkriss · Mar 19, 2013 · 66ac0c5 · 66ac0c5
2 parents f0d5e32 + 6893c23
commit 66ac0c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb
@@ -119,7 +119,7 @@ def email_with_translations
   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
@@ -92,7 +92,7 @@ def etag=(etag)
         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 @@ def cache_control_headers
           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