summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-06 10:27:22 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-06 10:27:22 +0000
commit87eeacba806c2d92afc93091df87fd74a702a87c (patch)
tree53b7353f97d89121df84f552ba863f3cd51248d6 /Gemfile
parenta7250c41e25e40c25faefc637e0680d12fda38a0 (diff)
downloadredmine-87eeacba806c2d92afc93091df87fd74a702a87c.tar.gz
redmine-87eeacba806c2d92afc93091df87fd74a702a87c.zip
Merged r9341 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9342 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile14
1 files changed, 8 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index e6181298a..50439f10a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,12 +16,14 @@ group :openid do
gem "ruby-openid", "~> 2.1.4", :require => "openid"
end
-# Optional gem for exporting the gantt to a PNG file
-group :rmagick 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"
+# Optional gem for exporting the gantt to a PNG file, not supported with jruby
+platforms :mri, :mingw do
+ group :rmagick 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"
+ end
end
# Database gems