From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 4 Jan 2015 02:57:11 +0000 (+0000)
Subject: 2.6-stable: Gemfile: simplify rmagick version definition
X-Git-Tag: 2.6.1~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=60347573124923776810204fd6df910eacc230f5;p=redmine.git

2.6-stable: Gemfile: simplify rmagick version definition

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13833 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index 424e8483e..3a29f58a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,11 +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
-    if RUBY_VERSION < "1.9"
-      gem "rmagick", "2.13.3"
-    else
-      gem "rmagick", ">= 2.0.0"
-    end
+    gem "rmagick", (RUBY_VERSION < "1.9" ? "2.13.3" : ">= 2.0.0")
   end
 
   # Optional Markdown support, not for JRuby