From 87be12a6b73df0b07b849275a2882a3b7367b7a8 Mon Sep 17 00:00:00 2001
From: Alexander Machehin <alexander.machehin@gmail.com>
Date: Mon, 4 Feb 2013 00:44:33 +0600
Subject: [PATCH] Fix error with avatars: [paperclip] An error was received
 while processing: Paperclip::Errors::NotIdentifiedByImageMagickError: ... is
 not recognized by the 'identify' command.

---
 Gemfile      |  2 +-
 Gemfile.lock | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index a99cf4ca7..42bfc3c2a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem 'omniauth-openid', '~> 1.0.1'
 gem 'cancan', '1.6.7' # 1.6.8 fail specs with strange error
 
 gem 'ancestry', '~> 1.3.0'
-gem 'paperclip', '~> 3.1.4'
+gem 'paperclip', '~> 3.3.1'
 gem 'resque', '~> 1.21.0'
 gem 'resque-status', '~> 0.3.3'
 gem 'resque_mailer', '~> 2.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7fbfc10d4..418bcf335 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,10 +82,7 @@ GEM
     charlock_holmes (0.6.9)
     chronic (0.6.7)
     chunky_png (1.2.7)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
-    cocaine (0.5.1)
-      climate_control (>= 0.0.3, < 1.0)
+    cocaine (0.4.2)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -206,11 +203,11 @@ GEM
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
     orm_adapter (0.4.0)
-    paperclip (3.1.4)
+    paperclip (3.3.1)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (>= 0.0.2)
+      cocaine (~> 0.4.0)
       mime-types
     perform_later (1.3.0)
       rails (~> 3.0)
@@ -415,7 +412,7 @@ DEPENDENCIES
   newrelic_rpm (~> 3.4.1)
   omniauth (~> 1.1.0)
   omniauth-openid (~> 1.0.1)
-  paperclip (~> 3.1.4)
+  paperclip (~> 3.3.1)
   perform_later (~> 1.3.0)
   pg (~> 0.14.0)
   rack-throttle