Merge branch 'redis-store' into 'master'
Bump redis-store to 1.1.6 and remove redis-store-fix-expiry According to this https://github.com/redis-store/redis-store/compare/v1.1.4...v1.1.6 and my manual tests the monkey patch for redis-store is no longer required /cc @jacobvosmaer @rspeicher See merge request !1081
This commit is contained in:
commit
0e994615a0
3 changed files with 3 additions and 46 deletions
|
@ -25,6 +25,7 @@ v 7.14.0 (unreleased)
|
||||||
- Add ability to manage user email addresses via the API.
|
- Add ability to manage user email addresses via the API.
|
||||||
- Disabled autocapitalize and autocorrect on login field (Daryl Chan)
|
- Disabled autocapitalize and autocorrect on login field (Daryl Chan)
|
||||||
- Mention group and project name in creation, update and deletion notices (Achilleas Pipinellis)
|
- Mention group and project name in creation, update and deletion notices (Achilleas Pipinellis)
|
||||||
|
- Remove redis-store TTL monkey patch
|
||||||
|
|
||||||
v 7.13.2
|
v 7.13.2
|
||||||
- Fix randomly failed spec
|
- Fix randomly failed spec
|
||||||
|
|
|
@ -508,7 +508,7 @@ GEM
|
||||||
rdoc (3.12.2)
|
rdoc (3.12.2)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
redcarpet (3.3.2)
|
redcarpet (3.3.2)
|
||||||
redis (3.1.0)
|
redis (3.2.1)
|
||||||
redis-actionpack (4.0.0)
|
redis-actionpack (4.0.0)
|
||||||
actionpack (~> 4)
|
actionpack (~> 4)
|
||||||
redis-rack (~> 1.5.0)
|
redis-rack (~> 1.5.0)
|
||||||
|
@ -525,7 +525,7 @@ GEM
|
||||||
redis-actionpack (~> 4)
|
redis-actionpack (~> 4)
|
||||||
redis-activesupport (~> 4)
|
redis-activesupport (~> 4)
|
||||||
redis-store (~> 1.1.0)
|
redis-store (~> 1.1.0)
|
||||||
redis-store (1.1.4)
|
redis-store (1.1.6)
|
||||||
redis (>= 2.2)
|
redis (>= 2.2)
|
||||||
request_store (1.0.5)
|
request_store (1.0.5)
|
||||||
rerun (0.10.0)
|
rerun (0.10.0)
|
||||||
|
|
|
@ -1,44 +0,0 @@
|
||||||
# Monkey-patch Redis::Store to make 'setex' and 'expire' work with namespacing
|
|
||||||
|
|
||||||
module Gitlab
|
|
||||||
class Redis
|
|
||||||
class Store
|
|
||||||
module Namespace
|
|
||||||
# Redis::Store#setex in redis-store 1.1.4 does not respect namespaces;
|
|
||||||
# this new method does.
|
|
||||||
def setex(key, expires_in, value, options=nil)
|
|
||||||
namespace(key) { |key| super(key, expires_in, value) }
|
|
||||||
end
|
|
||||||
|
|
||||||
# Redis::Store#expire in redis-store 1.1.4 does not respect namespaces;
|
|
||||||
# this new method does.
|
|
||||||
def expire(key, expires_in)
|
|
||||||
namespace(key) { |key| super(key, expires_in) }
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
# Our new definitions of #setex and #expire above assume that the
|
|
||||||
# #namespace method exists. Because we cannot be sure of that, we
|
|
||||||
# re-implement the #namespace method from Redis::Store::Namespace so
|
|
||||||
# that it is available for all Redis::Store instances, whether they use
|
|
||||||
# namespacing or not.
|
|
||||||
#
|
|
||||||
# Based on lib/redis/store/namespace.rb L49-51 (redis-store 1.1.4)
|
|
||||||
def namespace(key)
|
|
||||||
if @namespace
|
|
||||||
yield interpolate(key)
|
|
||||||
else
|
|
||||||
# This Redis::Store instance does not use a namespace so we should
|
|
||||||
# just pass through the key.
|
|
||||||
yield key
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
Redis::Store.class_eval do
|
|
||||||
include Gitlab::Redis::Store::Namespace
|
|
||||||
end
|
|
Loading…
Reference in a new issue