Require rmagick first instead of deprecated RMagick, closes carrierwa…

…veuploader#1681 # Conflicts: # lib/carrierwave/processing/rmagick.rb
extension · Jan 21, 2016 · 167b4ca · 167b4ca
1 parent 3a0978a
commit 167b4ca
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/lib/carrierwave/processing/rmagick.rb b/lib/carrierwave/processing/rmagick.rb
@@ -62,6 +62,8 @@ module RMagick
 
     included do
       begin
+        require "rmagick"
+      rescue LoadError
         require "RMagick"
       rescue LoadError => e
         e.message << " (You may need to install the rmagick gem)"