X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2a0917817c006aaad3be2fa6b5067eb6a506deb3..155babfec69a2a74af72ded0448fd28e6938e6aa:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 1bbc63f46..98a25e9ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,9 +40,9 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) - composite_primary_keys (5.0.0) + composite_primary_keys (5.0.1) activerecord (~> 3.2.0) - deadlock_retry (1.1.2) + deadlock_retry (1.2.0) dynamic_form (1.1.4) erubis (2.7.0) execjs (1.3.0) @@ -123,7 +123,7 @@ GEM rake (0.9.2.2) rdoc (3.12) json (~> 1.4) - rinku (1.5.0) + rinku (1.5.1) rmagick (2.13.1) ruby-openid (2.1.8) sanitize (2.0.3) @@ -158,7 +158,7 @@ DEPENDENCIES SystemTimer (>= 1.1.3) coffee-rails (~> 3.2.1) composite_primary_keys (>= 5.0.0) - deadlock_retry (>= 1.1.2) + deadlock_retry (>= 1.2.0) dynamic_form http_accept_language (>= 1.0.2) httpclient