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

diff --git a/Gemfile.lock b/Gemfile.lock
index 60f7ba699..98ab8b98e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,6 +32,7 @@ GEM
     addressable (2.2.6)
     arel (3.0.0)
     builder (3.0.0)
+    cocaine (0.2.1)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -39,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)
@@ -50,6 +52,7 @@ GEM
       multipart-post (~> 1.1)
       rack (~> 1.1)
     hike (1.2.1)
+    http_accept_language (1.0.2)
     httpclient (2.2.4)
     i18n (0.6.0)
     iconv (0.1)
@@ -81,6 +84,11 @@ GEM
       multi_json (~> 1.0)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
+    paperclip (2.5.2)
+      activerecord (>= 2.3.0)
+      activesupport (>= 2.3.2)
+      cocaine (>= 0.0.2)
+      mime-types
     pg (0.12.2)
     polyglot (0.3.3)
     rack (1.4.1)
@@ -149,8 +157,10 @@ 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
   iconv
   jquery-rails
@@ -159,6 +169,7 @@ DEPENDENCIES
   memcached
   oauth-plugin (>= 0.4.0.pre7)
   open_id_authentication (>= 1.1.0)
+  paperclip (~> 2.0)
   pg
   rails (= 3.2.0)
   rails-i18n-updater