upgrade rmagick to 2.14

And replace deprecated requiring "RMagick" to "rmagick".

git-svn-id: http://svn.redmine.org/redmine/trunk@14170 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 2498eefa52271707dc9c6f31e065f38ebb42d7fd..c67a8efbcf239cbca5b7b963c6f7e88113f47730 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ end
 platforms :mri, :mingw, :x64_mingw do
   # Optional gem for exporting the gantt to a PNG file, not supported with jruby
   group :rmagick do
-    gem "rmagick", "~> 2.13.4"
+    gem "rmagick", ">= 2.14.0"
   end
 
   # Optional Markdown support, not for JRuby

diff --git a/lib/redmine.rb b/lib/redmine.rb
index f041082a8e6f78273e6e2da789c005db2486e2b5..4eb1a44bd8368d2f76fc194b399a1c3b5e69e4f1 100644 (file)
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -18,7 +18,7 @@
 require 'redmine/core_ext'
 
 begin
-  require 'RMagick' unless Object.const_defined?(:Magick)
+  require 'rmagick' unless Object.const_defined?(:Magick)
 rescue LoadError
   # RMagick is not available
 end