summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-12-23 17:07:51 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-12-23 17:07:51 +0000
commita657a12450621e5ed9d0627b9a33a42d9799db3b (patch)
treeda2566c514702273488e4a85cac5fbc9b0f707dc /Gemfile
parent471e01ca5059f892888f78e2278dd41d742a4b75 (diff)
downloadredmine-a657a12450621e5ed9d0627b9a33a42d9799db3b.tar.gz
redmine-a657a12450621e5ed9d0627b9a33a42d9799db3b.zip
Don't load redcarpet with JRuby.
git-svn-id: http://svn.redmine.org/redmine/trunk@12453 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 3b8887ca0..b2da2827d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,8 +5,6 @@ gem "jquery-rails", "~> 2.0.2"
gem "coderay", "~> 1.1.0"
gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
gem "builder", "3.0.0"
-# TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped
-gem "redcarpet", "~> 2.3.0"
# Optional gem for LDAP authentication
group :ldap do
@@ -19,14 +17,20 @@ group :openid do
gem "rack-openid"
end
-# Optional gem for exporting the gantt to a PNG file, not supported with jruby
platforms :mri, :mingw do
+ # Optional gem for exporting the gantt to a PNG file, not supported with jruby
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
+
+ # Optional Markdown support, not for JRuby
+ group :markdown do
+ # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped
+ gem "redcarpet", "~> 2.3.0"
+ end
end
platforms :jruby do