Merge branch 'sh-appearance-cache-key-version' into 'master'

Use the GitLab version as part of the appearances cache key Closes gitlab-ee#5571 See merge request gitlab-org/gitlab-ce!18211

Merge branch 'sh-appearance-cache-key-version' into 'master'
42849263 · Douwe Maan · 702b4fec · d209a054 · 42849263 · 42849263
Commit 42849263 authored Apr 06, 2018 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

appearance.rb app/models/appearance.rb +1 -1

sh-appearance-cache-key-version.yml changelogs/unreleased/sh-appearance-cache-key-version.yml +5 -0

No files found.
--- a/app/models/appearance.rb
+++ b/app/models/appearance.rb
@@ -16,7 +16,7 @@ class Appearance < ActiveRecord::Base

  has_many :uploads, as: :model, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent

-  CACHE_KEY = 'current_appearance'.freeze
+  CACHE_KEY = "current_appearance:#{Gitlab::VERSION}".freeze

  after_commit :flush_redis_cache


--- a/changelogs/unreleased/sh-appearance-cache-key-version.yml
+++ b/changelogs/unreleased/sh-appearance-cache-key-version.yml
+---
+title: Use the GitLab version as part of the appearances cache key
+merge_request:
+author:
+type: fixed