From ede61fa9c7ffc15ebc961856f0864c7f256502f4 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 26 Dec 2014 14:35:30 +0000 Subject: [PATCH] 2.6-stable: Gemfile: pin i18n and rmagick versions due to bundler error on Ruby 1.8.7 git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13815 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 549525154..803988fa7 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,8 @@ gem "request_store", "1.0.5" gem "mime-types" gem "rbpdf", "~> 1.18.2" +gem "i18n", "~> 0.6.11", :platforms => [:mri_18, :mingw_18] + # Optional gem for LDAP authentication group :ldap do gem "net-ldap", "~> 0.3.1" @@ -26,7 +28,11 @@ 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", ">= 2.0.0" + if RUBY_VERSION < "1.9" + gem "rmagick", "2.13.3" + else + gem "rmagick", ">= 2.0.0" + end end # Optional Markdown support, not for JRuby -- 2.39.5