summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-03-10 18:54:32 +0000
committerRémy Coutable <remy@rymai.me>2017-03-10 18:54:32 +0000
commitc4ba6ea684052ff555e8683c23be5b25bf5abd11 (patch)
tree3cb4f418a3bc60624f488eb5a56a08777533ae8f
parentdaa4590ca3e64220bff1a4d94f9d1a5ddadf42fa (diff)
parent394d83ff17223b52c95bc2fd12cbfcde5a1e193d (diff)
downloadgitlab-ce-c4ba6ea684052ff555e8683c23be5b25bf5abd11.tar.gz
Merge branch 'fix-500-in-notes-polling' into 'master'
Fix notes polling failing after code changes Closes #29327 See merge request !9862
-rw-r--r--lib/gitlab/etag_caching/middleware.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/etag_caching/middleware.rb b/lib/gitlab/etag_caching/middleware.rb
index 0f24f9bbfde..ffbc6e17dc5 100644
--- a/lib/gitlab/etag_caching/middleware.rb
+++ b/lib/gitlab/etag_caching/middleware.rb
@@ -37,7 +37,7 @@ module Gitlab
def get_etag(env)
cache_key = env['PATH_INFO']
- store = Store.new
+ store = Gitlab::EtagCaching::Store.new
current_value = store.get(cache_key)
cached_value_present = current_value.present?