diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-06 07:33:27 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-06 07:33:27 +0000 |
| commit | 42849263ddf647d4b1ec67865316b939b44856d0 (patch) | |
| tree | 6750d415cb4d6041dd042a596d7cd419427e93e2 | |
| parent | 702b4fec317ca7fc4a2894a519aec5a0e95d16b6 (diff) | |
| parent | d209a05486503f1dd6412c777c1fd29fe02f0a40 (diff) | |
| download | gitlab-ce-42849263ddf647d4b1ec67865316b939b44856d0.tar.gz | |
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
| -rw-r--r-- | app/models/appearance.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-appearance-cache-key-version.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/appearance.rb b/app/models/appearance.rb index 2a6406d63c7..fb66dd0b766 100644 --- 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 diff --git a/changelogs/unreleased/sh-appearance-cache-key-version.yml b/changelogs/unreleased/sh-appearance-cache-key-version.yml new file mode 100644 index 00000000000..c17a3dc36cd --- /dev/null +++ b/changelogs/unreleased/sh-appearance-cache-key-version.yml @@ -0,0 +1,5 @@ +--- +title: Use the GitLab version as part of the appearances cache key +merge_request: +author: +type: fixed |