Merge pull request #1346 from mshibuya/fix-duplicated-rmagick-loading

Skip loading RMagick if already loaded
carrierwaveuploader · Apr 3, 2014 · c0bb87f · c0bb87f
2 parents 2284a37 + 9e6f213
commit c0bb87f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/carrierwave/processing/rmagick.rb b/lib/carrierwave/processing/rmagick.rb
@@ -62,7 +62,7 @@ module RMagick
 
     included do
       begin
-        require "RMagick"
+        require "RMagick" unless defined?(::Magick)
       rescue LoadError => e
         e.message << " (You may need to install the rmagick gem)"
         raise e