summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-12-08 09:22:46 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-12-08 09:22:46 +0000
commit1bcff510b150b240e4ec943c92d178c94f83d1f2 (patch)
treeb96638b6fec4f675b819729f61e8c9a4037a741c /Gemfile
parent00d16d07de69403541077ac1f0a4d62b71b6d9be (diff)
downloadredmine-1bcff510b150b240e4ec943c92d178c94f83d1f2.tar.gz
redmine-1bcff510b150b240e4ec943c92d178c94f83d1f2.zip
Don't use jruby-openssl with JRuby 1.7.0 (#12228).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10955 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 97f6d989c..586373f4d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,8 @@ platforms :mri_19, :mingw_19 do
end
platforms :jruby do
- gem "jruby-openssl"
+ # jruby-openssl is bundled with JRuby 1.7.0
+ gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
group :mysql do
gem "activerecord-jdbcmysql-adapter"