From 50005ccf955cbe53e4f844c2b580cb49faa2da55 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Wed, 2 Nov 2011 12:38:26 -0400
Subject: [PATCH] revert back to rmagick

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3606c5788..126f2c872 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem "meta_search", :git => "git://github.com/ernie/meta_search.git"
 gem "silent-postgres"
 gem "whenever", :require => false
 gem "sanitize", :git => "git://github.com/rgrove/sanitize.git"
-gem 'mini_magick'
+gem 'rmagick'
 
 group :development do
   gem 'pry'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3687da874..6382f8a97 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -81,8 +81,6 @@ GEM
     method_source (0.6.7)
       ruby_parser (>= 2.3.1)
     mime-types (1.17.2)
-    mini_magick (3.3)
-      subexec (~> 0.1.0)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
     multi_json (1.0.3)
@@ -125,6 +123,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.11)
       json (~> 1.4)
+    rmagick (2.13.1)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
     sass (3.1.10)
@@ -143,7 +142,6 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    subexec (0.1.0)
     super_exception_notifier (3.0.13)
       actionmailer
       rake
@@ -170,12 +168,12 @@ DEPENDENCIES
   mechanize
   memcache-client
   meta_search!
-  mini_magick
   mocha
   nokogiri
   pg
   pry
   rails (= 3.1.1)
+  rmagick
   sanitize!
   sass
   shoulda