From 8f8178d8148d9bc14cf1fb568320d6256f842ab9 Mon Sep 17 00:00:00 2001
From: Vinicius Stock <vinicius.stock@shopify.com>
Date: Wed, 29 Jan 2020 17:24:57 -0500
Subject: [PATCH] Cleanup cache expanded_key

---
 activesupport/lib/active_support/cache.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 0a35f69072..d3b7f7395d 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -681,15 +681,15 @@ def expanded_key(key)
           case key
           when Array
             if key.size > 1
-              key = key.collect { |element| expanded_key(element) }
+              key.collect { |element| expanded_key(element) }
             else
-              key = expanded_key(key.first)
+              expanded_key(key.first)
             end
           when Hash
-            key = key.sort_by { |k, _| k.to_s }.collect { |k, v| "#{k}=#{v}" }
-          end
-
-          key.to_param
+            key.collect { |k, v| "#{k}=#{v}" }.sort
+          else
+            key
+          end.to_param
         end
 
         def normalize_version(key, options = nil)
-- 
GitLab