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
This commit is contained in:
Toshi MARUYAMA
2015-04-14 05:35:57 +00:00
parent 1154fd33bf
commit 3a729e2a37

View File

@@ -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