X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bc10bc87586f43e1ec9ca542524f7b8798b29029..c7545691bbd3a62e20d323fa685f025d2bfbfe6f:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index f73d4a5d8..a7c1f9057 100644 --- 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,11 +381,12 @@ DEPENDENCIES omniauth-mediawiki (>= 0.0.3) omniauth-openid omniauth-windowslive + openstreetmap-deadlock_retry (>= 1.3.0) paperclip (~> 4.0) pg poltergeist psych - r2 + r2 (~> 0.2.7) rack-cors rack-uri_sanitizer rails (= 5.0.5)