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

Author: tomhughes

Gemfile

@@ -115,7 +115,7 @@ gem "maxminddb"
 gem "rotp"
 
 # Load memcache client in case we are using it
-gem "connection_pool", "< 3.0.0"
+gem "connection_pool", "< 4.0.0"
 gem "dalli", "< 5.0.0"
 
 # Load canonical-rails to generate canonical URLs

Gemfile.lock

@@ -194,7 +194,7 @@ GEM
     config (5.6.1)
       deep_merge (~> 1.2, >= 1.2.1)
       ostruct
-    connection_pool (2.5.5)
+    connection_pool (3.0.2)
     cork (0.3.0)
       colored2 (~> 3.1)
     crack (1.0.1)
@@ -938,7 +938,7 @@ DEPENDENCIES
   canonical-rails!
   capybara (>= 2.15)
   config
-  connection_pool (< 3.0.0)
+  connection_pool (< 4.0.0)
   dalli (< 5.0.0)
   danger
   danger-auto_label