diff options
| author | Joe Kutner <jpkutner@gmail.com> | 2013-05-10 13:04:40 -0500 |
|---|---|---|
| committer | Joe Kutner <jpkutner@gmail.com> | 2013-05-10 13:04:40 -0500 |
| commit | 430e5dce42523066368d46f6d5a769dd1ffcd743 (patch) | |
| tree | 128fa78dcae758857ba910945295882507706ee0 /railties | |
| parent | d7abe91cc73a8991033042f4cb7467bba7fa2339 (diff) | |
| download | rails-430e5dce42523066368d46f6d5a769dd1ffcd743.tar.gz rails-430e5dce42523066368d46f6d5a769dd1ffcd743.tar.bz2 rails-430e5dce42523066368d46f6d5a769dd1ffcd743.zip | |
Removed jruby-openssl gem from default template 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 |