X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e70396d70bff53c19e917d303f5b9d8f2abb7a3b..e2b185133ee03480d5bf5d66ca74944527841e95:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 27e164ebe..98ab8b98e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,8 +40,9 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    composite_primary_keys (4.1.2)
-      activerecord (~> 3.1)
+    composite_primary_keys (5.0.0.rc1)
+      activerecord (~> 3.2.0.rc2)
+    deadlock_retry (1.1.2)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (1.3.0)
@@ -156,7 +157,8 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   coffee-rails (~> 3.2.1)
-  composite_primary_keys (>= 4.1.2)
+  composite_primary_keys (>= 5.0.0.rc1)
+  deadlock_retry (>= 1.1.2)
   dynamic_form
   http_accept_language (>= 1.0.2)
   httpclient