Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
projects.thm.de
GitLab
Commits
87df0617
Commit
87df0617
authored
Jul 31, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump redis-store to 1.1.6 and remove redid-store-fix-expiry
parent
bdb4288a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
46 deletions
+3
-46
CHANGELOG
CHANGELOG
+1
-0
Gemfile.lock
Gemfile.lock
+2
-2
config/initializers/redis-store-fix-expiry.rb
config/initializers/redis-store-fix-expiry.rb
+0
-44
No files found.
CHANGELOG
View file @
87df0617
...
...
@@ -24,6 +24,7 @@ v 7.14.0 (unreleased)
- Add fetch command to the MR page.
- Disabled autocapitalize and autocorrect on login field (Daryl Chan)
- Mention group and project name in creation, update and deletion notices (Achilleas Pipinellis)
- Remove redis-store TTL monkey patch
v 7.13.2
- Fix randomly failed spec
...
...
Gemfile.lock
View file @
87df0617
...
...
@@ -508,7 +508,7 @@ GEM
rdoc (3.12.2)
json (~> 1.4)
redcarpet (3.3.2)
redis (3.
1.0
)
redis (3.
2.1
)
redis-actionpack (4.0.0)
actionpack (~> 4)
redis-rack (~> 1.5.0)
...
...
@@ -525,7 +525,7 @@ GEM
redis-actionpack (~> 4)
redis-activesupport (~> 4)
redis-store (~> 1.1.0)
redis-store (1.1.
4
)
redis-store (1.1.
6
)
redis (>= 2.2)
request_store (1.0.5)
rerun (0.10.0)
...
...
config/initializers/redis-store-fix-expiry.rb
deleted
100644 → 0
View file @
bdb4288a
# 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment