diff options
| author | Pat Allan <pat@freelancing-gods.com> | 2017-06-19 19:03:10 +1000 |
|---|---|---|
| committer | Pat Allan <pat@freelancing-gods.com> | 2017-06-20 18:04:44 +1000 |
| commit | 036bdee4d5bdad3b3fa1d57ca292214afe746a09 (patch) | |
| tree | 8eabc5fa599dce65e6266f7056fa8ff3252285a9 /activesupport/lib/active_support/cache.rb | |
| parent | b37aa68ff637c4ce1cfd9f6eaec659bc98a1e1b5 (diff) | |
| download | rails-036bdee4d5bdad3b3fa1d57ca292214afe746a09.tar.gz rails-036bdee4d5bdad3b3fa1d57ca292214afe746a09.tar.bz2 rails-036bdee4d5bdad3b3fa1d57ca292214afe746a09.zip | |
Make ActiveSupport frozen string literal friendly.
The ActiveSupport test suite only passes currently if it uses the latest unreleased commits for dalli, and a patch for Builder:
https://github.com/tenderlove/builder/pull/6
Beyond that, all external dependencies (at least, to the extent they’re used by ActiveSupport) are happy, including Nokogiri as of 1.8.0.
Diffstat (limited to 'activesupport/lib/active_support/cache.rb')
| -rw-r--r-- | activesupport/lib/active_support/cache.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 3847d8b7ae..3a95d07087 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -75,7 +75,7 @@ module ActiveSupport # # The +key+ argument can also respond to +cache_key+ or +to_param+. def expand_cache_key(key, namespace = nil) - expanded_cache_key = namespace ? "#{namespace}/" : "" + expanded_cache_key = (namespace ? "#{namespace}/" : "").dup if prefix = ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"] expanded_cache_key << "#{prefix}/" |