summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-06-21 12:42:45 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-06-21 12:42:45 -0300
commit94d9e33586b4d0faf422b5d86c9b8aee79056852 (patch)
tree4cb7d8e9a9604b775e376208631357cd4a349237 /lib/gitlab
parentd0a921b45ac66eb784043ee8092dc85f147b341a (diff)
downloadgitlab-ce-94d9e33586b4d0faf422b5d86c9b8aee79056852.tar.gz
Include the GitLab version in the cache key for Gitlab::JsonCache
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/json_cache.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/json_cache.rb b/lib/gitlab/json_cache.rb
index 9a0b2b35112..d01183d7845 100644
--- a/lib/gitlab/json_cache.rb
+++ b/lib/gitlab/json_cache.rb
@@ -22,10 +22,10 @@ module Gitlab
expanded_cache_key = [namespace, key].compact
if cache_key_with_version
- expanded_cache_key << Rails.version
+ expanded_cache_key << [Gitlab::VERSION, Rails.version]
end
- expanded_cache_key.join(':')
+ expanded_cache_key.flatten.join(':').freeze
end
def expire(key)