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

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
 

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