From: Tom Hughes <tom@compton.nu>
Date: Mon, 23 Sep 2013 13:41:52 +0000 (+0100)
Subject: Upgrade to paperclip 3.x
X-Git-Tag: live~4732
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3ba48b313a41df9988b0e77874f624ac37fb1677?ds=sidebyside

Upgrade to paperclip 3.x
---

diff --git a/Gemfile b/Gemfile
index 3f16358ed..5a601d6b7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
 gem 'composite_primary_keys', '>= 6.0.0'
 gem 'http_accept_language', '~> 1.0.2'
-gem 'paperclip', '~> 2.0'
+gem 'paperclip', '~> 3.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.2', :require => 'i18n-js'
 gem 'rack-cors'
diff --git a/Gemfile.lock b/Gemfile.lock
index aeaa596e1..bc019103b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -101,10 +101,10 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
-    paperclip (2.8.0)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
-      cocaine (>= 0.0.2)
+    paperclip (3.5.1)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.0)
       mime-types
     pg (0.17.0)
     polyglot (0.3.3)
@@ -194,7 +194,7 @@ DEPENDENCIES
   open_id_authentication (>= 1.1.0)
   openstreetmap-i18n-js (>= 3.0.0.rc5.2)
   openstreetmap-oauth-plugin (>= 0.4.1.1)
-  paperclip (~> 2.0)
+  paperclip (~> 3.0)
   pg
   psych
   r2