summaryrefslogtreecommitdiff
path: root/Gemfile
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
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')
-rw-r--r--Gemfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 0279b4ac47e..46431158fb5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -149,6 +149,10 @@ gem 'version_sorter', '~> 2.0.0'
# Cache
gem "redis-rails", '~> 4.0.0'
+# Redis
+gem 'redis', '~> 3.2'
+gem 'connection_pool', '~> 2.0'
+
# Campfire integration
gem 'tinder', '~> 1.10.0'
@@ -229,7 +233,6 @@ group :metrics do
gem 'allocations', '~> 1.0', require: false, platform: :mri
gem 'method_source', '~> 0.8', require: false
gem 'influxdb', '~> 0.2', require: false
- gem 'connection_pool', '~> 2.0', require: false
end
group :development do