]> source.dussan.org Git - redmine.git/commitdiff
2.6-stable: Gemfile: simplify rmagick version definition
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sun, 4 Jan 2015 02:57:11 +0000 (02:57 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sun, 4 Jan 2015 02:57:11 +0000 (02:57 +0000)
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13833 e93f8b46-1217-0410-a6f0-8f06a7374b81

Gemfile

diff --git a/Gemfile b/Gemfile
index 424e8483e83481b6be46a91a225b6e7f9751e062..3a29f58a89809ebd7c261787804e2205cce4fe67 100644 (file)
--- 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