From 0f4551a97092ee780793b64b56a3d29ba8329632 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Tue, 8 Jan 2019 22:16:21 +0000 Subject: Merge branch 'sh-revert-mr-23135' into 'master' Revert "Merge branch '3062-improve-project-cache' into 'master'" Closes #56103 See merge request gitlab-org/gitlab-ce!24244 (cherry picked from commit a0aca3ac3a4ef56429104c27cd03ce00dcaeafce) e884795e Revert "Merge branch '3062-improve-project-cache' into 'master'" --- lib/gitlab/repository_cache.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/gitlab/repository_cache.rb') diff --git a/lib/gitlab/repository_cache.rb b/lib/gitlab/repository_cache.rb index 6b0808f5304..56007574b1b 100644 --- a/lib/gitlab/repository_cache.rb +++ b/lib/gitlab/repository_cache.rb @@ -7,13 +7,13 @@ module Gitlab def initialize(repository, extra_namespace: nil, backend: Rails.cache) @repository = repository - @namespace = "project:#{repository.project.id}" + @namespace = "#{repository.full_path}:#{repository.project.id}" @namespace = "#{@namespace}:#{extra_namespace}" if extra_namespace @backend = backend end def cache_key(type) - "#{namespace}:#{type}" + "#{type}:#{namespace}" end def expire(key) -- cgit v1.2.3