From: Tom Hughes <tom@compton.nu>
Date: Tue, 21 Feb 2012 10:42:12 +0000 (+0000)
Subject: Drop rmagick as paperclip just uses the ImageMagick command line tool
X-Git-Tag: live~5839
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4c51a3035cfec42bf96eeb0e601bf24e5906ad54

Drop rmagick as paperclip just uses the ImageMagick command line tool
---

diff --git a/Gemfile b/Gemfile
index 98962574e..29094f410 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,9 +28,6 @@ gem 'iconv', :platforms => :ruby_18
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
 
-# Load ImageMagick support for user picture resizing
-gem 'rmagick', :require => 'RMagick'
-
 # Load HTML sanitizer
 gem 'sanitize'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 98a25e9ab..d9cf77253 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,8 +29,8 @@ GEM
     activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.6)
-    arel (3.0.0)
+    addressable (2.2.7)
+    arel (3.0.1)
     builder (3.0.0)
     cocaine (0.2.1)
     coffee-rails (3.2.2)
@@ -56,7 +56,7 @@ GEM
     httpclient (2.2.4)
     i18n (0.6.0)
     iconv (0.1)
-    journey (1.0.1)
+    journey (1.0.2)
     jquery-rails (2.0.0)
       railties (>= 3.2.0.beta, < 5.0)
       thor (~> 0.14)
@@ -70,7 +70,7 @@ GEM
     memcache-client (1.8.5)
     memcached (1.3.7)
     mime-types (1.17.2)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     multipart-post (1.1.5)
     nokogiri (1.5.0)
     oauth (0.4.5)
@@ -124,7 +124,6 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     rinku (1.5.1)
-    rmagick (2.13.1)
     ruby-openid (2.1.8)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
@@ -137,7 +136,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.9.9)
+    therubyracer (0.9.10)
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
@@ -174,7 +173,6 @@ DEPENDENCIES
   rails (= 3.2.1)
   rails-i18n-updater
   rinku (>= 1.2.2)
-  rmagick
   sanitize
   sass-rails (~> 3.2.3)
   therubyracer