aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-12 11:20:44 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-12 11:20:44 -0700
commit64a508f6628067d61d36c97acd148a9b0068fc6a (patch)
treeabf340e71b1b8122c1e436c4c9ae9162ceb16790 /Gemfile
parent0854ba149a02c268b3c16a1a26b540c65bbc8c64 (diff)
parent430e5dce42523066368d46f6d5a769dd1ffcd743 (diff)
downloadrails-64a508f6628067d61d36c97acd148a9b0068fc6a.tar.gz
rails-64a508f6628067d61d36c97acd148a9b0068fc6a.tar.bz2
rails-64a508f6628067d61d36c97acd148a9b0068fc6a.zip
Merge pull request #10560 from jkutner/master
Remove jruby-openssl from default Gemfile
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 0 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 661ef25a57..04562fe1d9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,11 +60,6 @@ platforms :jruby do
gem 'json'
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.7'
- # This is needed by now to let tests work on JRuby
- # TODO: When the JRuby guys merge jruby-openssl in
- # jruby this will be removed
- gem 'jruby-openssl'
-
group :db do
gem 'activerecord-jdbcmysql-adapter', '>= 1.2.7'
gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2.7'