]> source.dussan.org Git - redmine.git/commitdiff
2.6-stable: Gemfile: pin i18n and rmagick versions due to bundler error on Ruby 1.8.7
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Fri, 26 Dec 2014 14:35:30 +0000 (14:35 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Fri, 26 Dec 2014 14:35:30 +0000 (14:35 +0000)
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13815 e93f8b46-1217-0410-a6f0-8f06a7374b81

Gemfile

diff --git a/Gemfile b/Gemfile
index 549525154eabad30688001d41c3486c6b9562b3e..803988fa7ece4be6c09e64f1880ae63ed56bb807 100644 (file)
--- 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