summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-09-13 14:52:58 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-09-13 14:52:58 +0000
commit52f9ab110558fb8c689845a3b370ea01bd644dec (patch)
treedeb36b0549462422cd0633146f964cdc2050b91b
parent5fde4e22464ff5a133c9808cb7b7b6a759393543 (diff)
downloadredmine-52f9ab110558fb8c689845a3b370ea01bd644dec.tar.gz
redmine-52f9ab110558fb8c689845a3b370ea01bd644dec.zip
Use redcarpet 3.3 if using ruby 1.9 and higher (#20735).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14567 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index c5118f3c7..e4083f33c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,8 +33,7 @@ platforms :mri, :mingw do
# 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"
+ gem "redcarpet", (RUBY_VERSION < "1.9" ? "~> 2.3.0" : "~> 3.3.2")
end
end