diff options
-rw-r--r-- | app/models/environment.rb | 3 | ||||
-rw-r--r-- | lib/gitlab/etag_caching/store.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb index 6211a5c1e63..d5b974b2d31 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -209,7 +209,8 @@ class Environment < ActiveRecord::Base def etag_cache_key Gitlab::Routing.url_helpers.namespace_project_environments_path( project.namespace, - project) + project, + format: :json) end private 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 |