From bb9b244d18a03356372e9c6dc7aeee7c08919afc Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Mon, 10 Nov 2014 14:54:49 +1100
Subject: [PATCH] Upgrade paperclip to 3.x, fixes incorrect cropping of
 EXIF-rotated JPGs

---
 Gemfile.lock | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c1a2c66522..b98ceb4789 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,7 +23,7 @@ GIT
 
 GIT
   remote: git://github.com/openfoodfoundation/spree.git
-  revision: bbe5e779bcb883a1726ad4006d7c06b06c3f5372
+  revision: 4e0075b07acb56864aca89eee3d9670136176c23
   branch: 1-3-stable
   specs:
     spree (1.3.6.beta)
@@ -50,7 +50,7 @@ GIT
       json (>= 1.5.5)
       kaminari (= 0.14.1)
       money (= 5.1.1)
-      paperclip (~> 2.8)
+      paperclip (~> 3.0)
       rabl (= 0.7.2)
       rails (~> 3.2.16)
       ransack (= 0.7.2)
@@ -121,17 +121,17 @@ GEM
     active_link_to (1.0.0)
     active_model_serializers (0.8.1)
       activemodel (>= 3.0)
-    active_utils (2.2.1)
+    active_utils (2.2.3)
       activesupport (>= 2.3.11)
       i18n
-    activemerchant (1.43.1)
-      active_utils (~> 2.0, >= 2.0.1)
-      activesupport (>= 2.3.14, < 5.0.0)
+    activemerchant (1.44.1)
+      active_utils (~> 2.2.0)
+      activesupport (>= 3.2.14, < 5.0.0)
       builder (>= 2.1.2, < 4.0.0)
-      i18n (~> 0.5)
+      i18n (>= 0.6.9)
       json (~> 1.7)
-      money (< 7.0.0)
       nokogiri (~> 1.4)
+      offsite_payments (~> 2.0.0)
     activemodel (3.2.19)
       activesupport (= 3.2.19)
       builder (~> 3.0.0)
@@ -292,7 +292,7 @@ GEM
     httparty (0.13.1)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.6.9)
+    i18n (0.6.11)
     immigrant (0.1.6)
       activerecord (>= 3.0)
       foreigner (>= 1.2.1)
@@ -323,7 +323,7 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.25.1)
-    mini_portile (0.6.0)
+    mini_portile (0.6.1)
     momentjs-rails (2.5.1)
       railties (>= 3.1)
     money (5.1.1)
@@ -334,14 +334,22 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.6.8)
     newrelic_rpm (3.6.7.152)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
+    offsite_payments (2.0.1)
+      active_utils (~> 2.2.0)
+      activesupport (>= 3.2.14, < 5.0.0)
+      builder (>= 2.1.2, < 4.0.0)
+      i18n (~> 0.5)
+      json (~> 1.7)
+      money (< 7.0.0)
+      nokogiri (~> 1.4)
     oj (2.1.2)
     orm_adapter (0.5.0)
-    paperclip (2.8.0)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
-      cocaine (>= 0.0.2)
+    paperclip (3.5.4)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.3)
       mime-types
     paypal-sdk-core (0.2.10)
       multi_json (~> 1.0)
@@ -445,7 +453,7 @@ GEM
     slop (3.4.5)
     spinjs-rails (1.3)
       rails (>= 3.1)
-    sprockets (2.2.2)
+    sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -468,7 +476,7 @@ GEM
       sprockets (>= 2.0.0)
     turn (0.8.3)
       ansi
-    tzinfo (0.3.39)
+    tzinfo (0.3.42)
     uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
@@ -479,7 +487,7 @@ GEM
     unicorn-rails (1.1.0)
       rack
       unicorn
-    uuidtools (2.1.4)
+    uuidtools (2.1.5)
     versioncake (0.4.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)