X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/10fb373e5e1fe6582e43f72556e5b15f86e6c20a..682ccc18df1911dbf737da87fc48d40705c72f40:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 75248b927..2291fc0d9 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)
@@ -41,6 +42,7 @@ GEM
     coffee-script-source (1.2.0)
     composite_primary_keys (4.1.2)
       activerecord (~> 3.1)
+    deadlock_retry (1.1.2)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (1.3.0)
@@ -82,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)
@@ -151,6 +158,7 @@ DEPENDENCIES
   SystemTimer (>= 1.1.3)
   coffee-rails (~> 3.2.1)
   composite_primary_keys (>= 4.1.2)
+  deadlock_retry (>= 1.1.2)
   dynamic_form
   http_accept_language (>= 1.0.2)
   httpclient
@@ -161,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