From 40c4682b5bd337e99e94760d5b16a84690ed3f9a Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Tue, 14 Apr 2015 05:38:14 +0000 Subject: [PATCH] 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 --- Gemfile | 2 +- lib/redmine.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 2498eefa5..c67a8efbc 100644 --- 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 f041082a8..4eb1a44bd 100644 --- 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 -- 2.39.5