diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-12 11:20:44 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-12 11:20:44 -0700 |
| commit | 64a508f6628067d61d36c97acd148a9b0068fc6a (patch) | |
| tree | abf340e71b1b8122c1e436c4c9ae9162ceb16790 /railties | |
| parent | 0854ba149a02c268b3c16a1a26b540c65bbc8c64 (diff) | |
| parent | 430e5dce42523066368d46f6d5a769dd1ffcd743 (diff) | |
| download | rails-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 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 243e7e9da8..577ff651e5 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -4,8 +4,6 @@ source 'https://rubygems.org' <%= database_gemfile_entry -%> -<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%> - <%= assets_gemfile_entry %> <%= javascript_gemfile_entry -%> diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 0ffb615764..e992534938 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -183,9 +183,6 @@ class AppGeneratorTest < Rails::Generators::TestCase run_generator([destination_root, "-d", "jdbcmysql"]) assert_file "config/database.yml", /mysql/ assert_gem "activerecord-jdbcmysql-adapter" - # TODO: When the JRuby guys merge jruby-openssl in - # jruby this will be removed - assert_gem "jruby-openssl" if defined?(JRUBY_VERSION) end def test_config_jdbcsqlite3_database |