cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to using openstreetmap-deadlock_retry

Browse source 
Closes #1602
This commit is contained in:
Tom Hughes 2017-08-03 18:41:45 +01:00
parent e2367194b7
commit c7377c7f9f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -43,7 +43,7 @@ gem "image_optim_rails"
# Load rails plugins # Load rails plugins
gem "actionpack-page_caching" gem "actionpack-page_caching"
gem "composite_primary_keys", "~> 9.0.7" 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 "dynamic_form"
gem "http_accept_language", "~> 2.0.0" gem "http_accept_language", "~> 2.0.0"
gem "i18n-js", ">= 3.0.0" gem "i18n-js", ">= 3.0.0"

4
Gemfile.lock
View file

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