Merge remote-tracking branch 'upstream/pull/3356'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 75cb1054bb0ced0350e7e2b4dc4ccde399f2bf5f..17f6cc7918088f087c7e4121241785e1db2a0720 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -96,6 +96,7 @@ gem "maxminddb"
 gem "rotp"
 
 # Load memcache client in case we are using it
 gem "rotp"
 
 # Load memcache client in case we are using it

+gem "connection_pool"

 gem "dalli"
 gem "kgio"
 
 gem "dalli"
 gem "kgio"
 


@@ -147,7 +148,7 @@ group :test do
   gem "rubocop-performance"
   gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2
   gem "rubocop-rake"
   gem "rubocop-performance"
   gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2
   gem "rubocop-rake"

-  gem "selenium-webdriver"
+  gem "selenium-webdriver", "~> 3.142.7"

   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false
   gem "webmock"
   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false
   gem "webmock"