summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-04-08 22:26:53 +0000
committerRobert Speicher <robert@gitlab.com>2016-04-08 22:26:53 +0000
commit93571c433584d7d183c8d0555a4d210d0ae75e16 (patch)
tree91662554ff7c2245cf8e0b99b3963fd21fb0dfb6 /Gemfile.lock
parent833808d737058ff25b34f6bd5eb4d4989c43e49d (diff)
parentcf669551f69edd66913d22c96cf1de1302e7990e (diff)
downloadgitlab-ce-93571c433584d7d183c8d0555a4d210d0ae75e16.tar.gz
Merge branch 'redis-connection-pool' into 'master'
Redis connection pool Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 Having an easily accessible Redis connection pool allows us to do more cool stuff with Redis in GitLab (instead of having to go through e.g. the Rails cache). See merge request !3521
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock1
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ba8d748db1..a30706a4318 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -999,6 +999,7 @@ DEPENDENCIES
rdoc (~> 3.6)
recaptcha
redcarpet (~> 3.3.3)
+ redis (~> 3.2)
redis-namespace
redis-rails (~> 4.0.0)
request_store (~> 1.3.0)