Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-06-12 10:09:51 +0300
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-06-12 13:59:36 +0300
commitf20949a332cf13bb0a75d6a4290aec525db35885 (patch)
tree53d41ef367e9e261534e1fabf5e96226c86d59a3 /lib/gitlab/etag_caching
parent6b3f6c9f9391433783e5c920e38eecf2767b3353 (diff)
Fix etag route misses
Fixes gitlab-org/gitlab-ce#33106
Diffstat (limited to 'lib/gitlab/etag_caching')
-rw-r--r--lib/gitlab/etag_caching/store.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/etag_caching/store.rb b/lib/gitlab/etag_caching/store.rb
index 17750fe803e..072fcfc65e6 100644
--- a/lib/gitlab/etag_caching/store.rb
+++ b/lib/gitlab/etag_caching/store.rb
@@ -25,8 +25,8 @@ module Gitlab
end
def redis_key(key)
- raise 'Invalid key' unless Gitlab::EtagCaching::Router.match(key)
-
+ raise 'Invalid key' if !Rails.env.production? && !Gitlab::EtagCaching::Router.match(key)
+
"#{REDIS_NAMESPACE}#{key}"
end
end