Switch to using openstreetmap-deadlock_retry

Closes #1602

diff --git a/Gemfile b/Gemfile
index fecc797d092129458c7c0fc0c481ea5d9f678637..2bab3edfdffcf333940ed34e12bf6494576088a9 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ gem "image_optim_rails"
 # Load rails plugins
 gem "actionpack-page_caching"
 gem "composite_primary_keys", "~> 9.0.7"
-gem "deadlock_retry", ">= 1.2.0"
+gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"

diff --git a/Gemfile.lock b/Gemfile.lock
index 3cb46643ad21eaabdd80d41647795743f5051e23..a7c1f90571036a4dc0acf1ba84fd7a5b1425f63b 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,7 +82,6 @@ GEM
       safe_yaml (~> 1.0.0)
     crass (1.0.2)
     dalli (2.7.6)
-    deadlock_retry (1.2.0)
     docile (1.1.5)
     dynamic_form (1.1.4)
     erubis (2.7.0)
@@ -205,6 +204,7 @@ GEM
     omniauth-windowslive (0.0.12)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
+    openstreetmap-deadlock_retry (1.3.0)
     paperclip (4.3.7)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
@@ -356,7 +356,6 @@ DEPENDENCIES
   composite_primary_keys (~> 9.0.7)
   coveralls
   dalli
-  deadlock_retry (>= 1.2.0)
   dynamic_form
   factory_girl_rails
   faraday
@@ -382,6 +381,7 @@ DEPENDENCIES
   omniauth-mediawiki (>= 0.0.3)
   omniauth-openid
   omniauth-windowslive
+  openstreetmap-deadlock_retry (>= 1.3.0)
   paperclip (~> 4.0)
   pg
   poltergeist