diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2016-12-24 11:33:04 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2016-12-24 11:36:51 +0900 |
| commit | 4db99eb87b98f3810e782fd745b0474467f9ce66 (patch) | |
| tree | bc75f2e2a02f46af0d94d4210de0a71eaebbe7cb /activesupport/lib/active_support/cache.rb | |
| parent | 0fdd9bd39eb7a90829260a89a4255a87698b13e1 (diff) | |
| download | rails-4db99eb87b98f3810e782fd745b0474467f9ce66.tar.gz rails-4db99eb87b98f3810e782fd745b0474467f9ce66.tar.bz2 rails-4db99eb87b98f3810e782fd745b0474467f9ce66.zip | |
No need to nodoc private methods
Diffstat (limited to 'activesupport/lib/active_support/cache.rb')
| -rw-r--r-- | activesupport/lib/active_support/cache.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 8f0a954882..bef0ed8ec4 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -511,7 +511,7 @@ module ActiveSupport private # Merges the default options with ones specific to a method call. - def merged_options(call_options) # :nodoc: + def merged_options(call_options) if call_options options.merge(call_options) else @@ -522,7 +522,7 @@ module ActiveSupport # Expands key to be a consistent string value. Invokes +cache_key+ if # object responds to +cache_key+. Otherwise, +to_param+ method will be # called. If the key is a Hash, then keys will be sorted alphabetically. - def expanded_key(key) # :nodoc: + def expanded_key(key) return key.cache_key.to_s if key.respond_to?(:cache_key) case key |