diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-05 00:30:42 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-05 00:30:42 -0700 |
| commit | 3e9bb5459cfc88e0fa6de7a14b21490308ed9682 (patch) | |
| tree | 719257556d872802a4d2749aa6e90636e5e1e8b9 /railties | |
| parent | 65fd004da4add3e9b5cdc65a41d74d7ba442eac3 (diff) | |
| parent | 2f331fd9b2649bd431207a8c83304795bee1ef8e (diff) | |
| download | rails-3e9bb5459cfc88e0fa6de7a14b21490308ed9682.tar.gz rails-3e9bb5459cfc88e0fa6de7a14b21490308ed9682.tar.bz2 rails-3e9bb5459cfc88e0fa6de7a14b21490308ed9682.zip | |
Merge pull request #390 from arunagw/jruby_openssl
Adding jruby-openssl in Gemfile by default. #jruby
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 1 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index b046edd5b7..a69efdf29d 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -4,6 +4,7 @@ source 'http://rubygems.org' <%= database_gemfile_entry -%> +<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) && JRUBY_VERSION < "1.6" -%> # Asset template engines <%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%> gem 'sass' diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 81263a6ce9..e271095636 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -135,6 +135,7 @@ class AppGeneratorTest < Rails::Generators::TestCase run_generator([destination_root, "-d", "jdbcmysql"]) assert_file "config/database.yml", /jdbcmysql/ assert_file "Gemfile", /^gem\s+["']activerecord-jdbcmysql-adapter["']$/ + assert_file "Gemfile", /^gem\s+["']jruby-openssl["']$/ if defined?(JRUBY_VERSION) && JRUBY_VERSION < "1.6" end def test_config_jdbcsqlite3_database |