From 3a729e2a3715a25fe6038ffde853cf78b2f14167 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Tue, 14 Apr 2015 05:35:57 +0000 Subject: [PATCH] Merged r14167 from trunk to 2.6-stable Gemfile: pin rmagick version 2.13 rmagick 2.14 prints '[DEPRECATION] requiring "RMagick" is deprecated. Use "rmagick" instead'. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14169 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index eaaf71cba..d7f64ca1f 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ platforms :mri, :mingw do # RMagick 2 supports ruby 1.9 # RMagick 1 would be fine for ruby 1.8 but Bundler does not support # different requirements for the same gem on different platforms - gem "rmagick", (RUBY_VERSION < "1.9" ? "2.13.3" : ">= 2.0.0") + gem "rmagick", (RUBY_VERSION < "1.9" ? "2.13.3" : "~> 2.13.4") end # Optional Markdown support, not for JRuby