mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #9792 from vipulnsward/drop_unused_hash
drop an unused hash; change slang to SPECIAL
This commit is contained in:
commit
66ac0c567d
2 changed files with 3 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue